diff --git a/README.md b/README.md
index 6153d2920d8..f182b6931fd 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Currently, the following languages/frameworks are supported:
 - Openapi spec inline schemas supported at any depth
 - If needed, validation of some json schema keywords can be deactivated via a configuration class
 - Payload values are not coerced when validated, so a datetime value can pass other validations that describe the payload only as type string
-- String transmission of numbers supported with type: string, format: number, value can be accessed as a Decimal with inst.as_decimal_oapg
+- String transmission of numbers supported with type: string, format: number, value can be accessed as a Decimal with inst.as_decimal_
 - Multiple content types supported for request and response bodies
 - Endpoint response always also includes the urllib3.HTTPResponse
 - Endpoint response deserialization can be skipped with the skip_deserialization argument
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenRequestBody.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenRequestBody.java
index 27453523055..0637d38b22b 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenRequestBody.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenRequestBody.java
@@ -17,8 +17,6 @@
 
 package org.openapitools.codegen;
 
-import org.openapitools.codegen.utils.ModelUtils;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -31,7 +29,7 @@
  * A unique parameter is defined by a combination of a name and location.
  * Parameters may be located in a path, query, header or cookie.
  */
-public class CodegenRequestBody implements OpenapiComponent {
+public class CodegenRequestBody implements OpenApiComponent {
     protected String description, unescapedDescription;
 
     protected CodegenKey name;
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
index d23c5c09211..661613b49b8 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -19,7 +19,7 @@
 
 import java.util.*;
 
-public class CodegenResponse implements OpenapiComponent {
+public class CodegenResponse implements OpenApiComponent {
     private CodegenKey name;
     private Map<String, CodegenHeader> headers;
     public String message;
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenSchema.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenSchema.java
index 7b16300fe9a..efcc662c170 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenSchema.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenSchema.java
@@ -21,7 +21,7 @@
 
 import java.util.*;
 
-public class CodegenSchema implements JsonSchema, OpenapiComponent {
+public class CodegenSchema implements OpenApiSchema, OpenApiComponent {
     // testCases are for autogenerated tests of schemas
     public HashMap<String, SchemaTestCase> testCases = new HashMap<>();
     private String componentModule;
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 789efd5d3e7..a2ef6c460d3 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2211,7 +2211,7 @@ protected String toComponentModule(String componentName, String priorJsonPathSeg
         return packageName + "." + priorJsonPathSegment + "." + componentName;
     }
 
-    protected void setAddProps(Schema schema, JsonSchema property, String sourceJsonPath, String currentJsonPath) {
+    protected void setAddProps(Schema schema, OpenApiSchema property, String sourceJsonPath, String currentJsonPath) {
         if (schema.getAdditionalProperties() == null) {
             return;
         }
@@ -3905,11 +3905,11 @@ protected boolean shouldAddImport(String type) {
     /**
      * Add variables (properties) to codegen model (list of properties, various flags, etc)
      *
-     * @param m          Must be an instance of JsonSchema, may be model or property...
+     * @param m          Must be an instance of OpenApiSchema, may be model or property...
      * @param properties a map of properties (schema)
      * @param mandatory  a set of required properties' name
      */
-    protected void addProperties(JsonSchema m, Map<String, Schema> properties, Set<String> mandatory, String sourceJsonPath, String currentJsonPath) {
+    protected void addProperties(OpenApiSchema m, Map<String, Schema> properties, Set<String> mandatory, String sourceJsonPath, String currentJsonPath) {
         if (properties == null) {
             return;
         }
@@ -5060,7 +5060,7 @@ protected String toRefModule(String ref, String sourceJsonPath, String expectedC
         return null;
     }
 
-    private void setLocationInfo(String ref, OpenapiComponent instance, String sourceJsonPath, String expectedComponentType) {
+    private void setLocationInfo(String ref, OpenApiComponent instance, String sourceJsonPath, String expectedComponentType) {
         if (ref != null) {
             instance.setRef(ref);
             String refModule = toRefModule(ref, sourceJsonPath, expectedComponentType);
@@ -5156,7 +5156,7 @@ public CodegenKey getKey(String key) {
         return ck;
     }
 
-    protected void addRequiredProperties(Schema schema, JsonSchema property, String sourceJsonPath, String currentJsonPath) {
+    protected void addRequiredProperties(Schema schema, OpenApiSchema property, String sourceJsonPath, String currentJsonPath) {
         /*
         this should be called after vars and additionalProperties are set
         Features added by storing codegenProperty values:
@@ -5211,7 +5211,7 @@ protected void addRequiredProperties(Schema schema, JsonSchema property, String
         }
     }
 
-    protected void addVarsRequiredVarsAdditionalProps(Schema schema, JsonSchema property, String sourceJsonPath, String currentJsonPath) {
+    protected void addVarsRequiredVarsAdditionalProps(Schema schema, OpenApiSchema property, String sourceJsonPath, String currentJsonPath) {
         setAddProps(schema, property, sourceJsonPath, currentJsonPath);
         Set<String> mandatory = schema.getRequired() == null ? Collections.emptySet()
                 : new TreeSet<>(schema.getRequired());
@@ -5609,7 +5609,7 @@ public String getAdditionalPropertiesName() {
      * Used to ensure that null or Schema is returned given an input Boolean/Schema/null
      * This will be used in openapi 3.1.0 spec processing to ensure that Booleans become Schemas
      * Because our generators only understand Schemas
-     * Note: use getIsBooleanSchemaTrue or getIsBooleanSchemaFalse on the JsonSchema
+     * Note: use getIsBooleanSchemaTrue or getIsBooleanSchemaFalse on the OpenApiSchema
      * if you need to be able to detect if the original schema's value was true or false
      *
      * @param schema the input Boolean or Schema data to convert to a Schema
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenapiComponent.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiComponent.java
similarity index 58%
rename from modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenapiComponent.java
rename to modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiComponent.java
index d631ca3ac45..1ea8bc2f3a2 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenapiComponent.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiComponent.java
@@ -1,20 +1,6 @@
 package org.openapitools.codegen;
 
-import io.swagger.v3.oas.models.media.Schema;
-import org.openapitools.codegen.meta.FeatureSet;
-import org.openapitools.codegen.meta.features.SchemaSupportFeature;
-import org.openapitools.codegen.utils.ModelUtils;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Stream;
-
-public interface OpenapiComponent {
+public interface OpenApiComponent {
     // set only if the instance is at the json path of a component
     String getComponentModule();
 
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/JsonSchema.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiSchema.java
similarity index 95%
rename from modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/JsonSchema.java
rename to modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiSchema.java
index d2a6c8eea6b..8ec10a6fc2e 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/JsonSchema.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/OpenApiSchema.java
@@ -1,20 +1,13 @@
 package org.openapitools.codegen;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.media.Schema;
-import org.openapitools.codegen.meta.FeatureSet;
-import org.openapitools.codegen.meta.features.SchemaSupportFeature;
 import org.openapitools.codegen.utils.ModelUtils;
 
-public interface JsonSchema {
+public interface OpenApiSchema {
     // 3.1.0
     CodegenSchema getContains();
 
@@ -221,7 +214,7 @@ public interface JsonSchema {
     void setExternalDocumentation(ExternalDocumentation externalDocumentation);
 
     /**
-     * Syncs all the schema's type properties into the JsonSchema instance
+     * Syncs all the schema's type properties into the OpenApiSchema instance
      * for now this only supports types without format information
      * TODO: in the future move the format handling in here too
      * @param p the schema which contains the type info
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index 66acef4d150..5422c4f2ca0 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -26,7 +26,7 @@
 import io.swagger.v3.oas.models.servers.Server;
 
 import org.apache.commons.io.FileUtils;
-import org.openapitools.codegen.JsonSchema;
+import org.openapitools.codegen.OpenApiSchema;
 import org.openapitools.codegen.api.TemplatePathLocator;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.openapitools.codegen.ignore.CodegenIgnoreProcessor;
@@ -540,7 +540,7 @@ are defined in that schema (x.properties). We do this because validation should
     they are not.
      */
     @Override
-    protected void addVarsRequiredVarsAdditionalProps(Schema schema, JsonSchema property, String sourceJsonPath, String currentJsonPath){
+    protected void addVarsRequiredVarsAdditionalProps(Schema schema, OpenApiSchema property, String sourceJsonPath, String currentJsonPath){
         setAddProps(schema, property, sourceJsonPath, currentJsonPath);
         if (ModelUtils.isAnyType(schema) && supportsAdditionalPropertiesWithComposedSchema) {
             // if anyType schema has properties then add them
diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
index a4ebfd4308c..9d078c22b36 100644
--- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
+++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java
@@ -34,8 +34,7 @@
 import io.swagger.v3.parser.util.RemoteUrl;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.CodegenSchema;
-import org.openapitools.codegen.JsonSchema;
+import org.openapitools.codegen.OpenApiSchema;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1463,8 +1462,8 @@ public static boolean isAnyType(Schema schema) {
         return (schema.get$ref() == null && schema.getType() == null);
     }
 
-    public static void syncValidationProperties(Schema schema, JsonSchema target) {
-        // TODO move this method to JsonSchema
+    public static void syncValidationProperties(Schema schema, OpenApiSchema target) {
+        // TODO move this method to OpenApiSchema
         if (schema != null && target != null) {
             if (isNullType(schema) || schema.get$ref() != null || isBooleanSchema(schema)) {
                 return;
@@ -1508,24 +1507,24 @@ public static void syncValidationProperties(Schema schema, JsonSchema target) {
         }
     }
 
-    private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, JsonSchema target) {
+    private static void setArrayValidations(Integer minItems, Integer maxItems, Boolean uniqueItems, OpenApiSchema target) {
         if (minItems != null) target.setMinItems(minItems);
         if (maxItems != null) target.setMaxItems(maxItems);
         if (uniqueItems != null) target.setUniqueItems(uniqueItems);
     }
 
-    private static void setObjectValidations(Integer minProperties, Integer maxProperties, JsonSchema target) {
+    private static void setObjectValidations(Integer minProperties, Integer maxProperties, OpenApiSchema target) {
         if (minProperties != null) target.setMinProperties(minProperties);
         if (maxProperties != null) target.setMaxProperties(maxProperties);
     }
 
-    private static void setStringValidations(Integer minLength, Integer maxLength, String pattern, JsonSchema target) {
+    private static void setStringValidations(Integer minLength, Integer maxLength, String pattern, OpenApiSchema target) {
         if (minLength != null) target.setMinLength(minLength);
         if (maxLength != null) target.setMaxLength(maxLength);
         if (pattern != null) target.setPattern(pattern);
     }
 
-    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, Boolean exclusiveMinimum, Boolean exclusiveMaximum, JsonSchema target) {
+    private static void setNumericValidations(Schema schema, BigDecimal multipleOf, BigDecimal minimum, BigDecimal maximum, Boolean exclusiveMinimum, Boolean exclusiveMaximum, OpenApiSchema target) {
         if (multipleOf != null) target.setMultipleOf(multipleOf);
         if (minimum != null) {
             if (isIntegerSchema(schema)) {
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/README.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/README.handlebars
index 06e5a4c3984..a9443511cc2 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/README.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/README.handlebars
@@ -35,25 +35,25 @@ Python {{generatorLanguageVersion}}
         - ingested None will subclass NoneClass
         - ingested True will subclass BoolClass
         - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
+        - So if you need to check is True/False/None, instead use instance.is_true_()/.is_false_()/.is_none_()
 5. All validated class instances are immutable except for ones based on io.File
     - This is because if properties were changed after validation, that validation would no longer apply
     - So no changing values or property values after a class has been instantiated
 6. String + Number types with formats
     - String type data is stored as a string and if you need to access types based on its format like date,
     date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
+    - type string + format: See .as_date_, .as_datetime_, .as_decimal_, .as_uuid_
+    - type number + format: See .as_float_, .as_int_
     - this was done because openapi/json-schema defines constraints. string data may be type string with no format
     keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
+    - So if you need to access a string format based type, use as_date_/as_datetime_/as_decimal_/as_uuid_
+    - So if you need to access a number format based type, use as_int_/as_float_
 7. Property access on AnyType(type unset) or object(dict) schemas
     - Only required keys with valid python names are properties like .someProp and have type hints
     - All optional keys may not exist, so properties are not defined for them
     - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+    - Use get_item_ if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_('optionalProp')
         - All required and optional keys have type hints for this method, and @typing.overload is used
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
@@ -69,19 +69,18 @@ Python {{generatorLanguageVersion}}
     - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
     - So you will need to update your import paths to the api classes
 
-### Why are Oapg and _oapg used in class and method names?
+### Why are Leading and Trailing Underscores in class and method names?
 Classes can have arbitrarily named properties set on them
 Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
+For those reasons, I use the prefix and suffix _ to greatly reduce the likelihood of collisions
 on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
 
 ### Object property spec case
 This was done because when payloads are ingested, they can be validated against N number of schemas.
 If the input signature used a different property name then that has mutated the payload.
 So SchemaA and SchemaB must both see the camelCase spec named variable.
 Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
+That use case should work, so spec case is used.
 
 ### Parameter spec case
 Parameters can be included in different locations including:
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars
index 9a2692d03db..fe7c57e4d49 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/api_client.handlebars
@@ -670,12 +670,12 @@ class HeaderParameterWithoutName(ParameterBase, StyleSimpleSerializer):
             """
             if cls.style:
                 extracted_data = cls._deserialize_simple(in_data, name, cls.explode, False)
-                return schema.from_openapi_data_oapg(extracted_data)
+                return schema.from_openapi_data_(extracted_data)
         # cls.content will be length one
         for content_type, schema in cls.content.items():
             if cls._content_type_is_json(content_type):
                 cast_in_data = json.loads(in_data)
-                return schema.from_openapi_data_oapg(cast_in_data)
+                return schema.from_openapi_data_(cast_in_data)
             raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -753,7 +753,7 @@ class ApiResponseWithoutDeserialization(ApiResponse):
 
 class TypedDictInputVerifier:
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -890,7 +890,7 @@ class OpenApiResponse(JSONDetector, TypedDictInputVerifier, typing.Generic[T]):
 
         deserialized_headers = schemas.unset
         if cls.headers is not None:
-            cls._verify_typed_dict_inputs_oapg(cls.response_cls.headers, response.headers)
+            cls._verify_typed_dict_inputs(cls.response_cls.headers, response.headers)
             deserialized_headers = {}
             for header_name, header_param in self.headers.items():
                 header_value = response.getheader(header_name)
@@ -923,8 +923,8 @@ class OpenApiResponse(JSONDetector, TypedDictInputVerifier, typing.Generic[T]):
                 content_type = 'multipart/form-data'
             else:
                 raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
+            deserialized_body = body_schema.from_openapi_data_(
+                body_data, configuration_=configuration)
         elif streamed:
             response.release_conn()
 
@@ -1259,7 +1259,7 @@ class Api(TypedDictInputVerifier):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def _get_host_oapg(
+    def _get_host(
         self,
         operation_id: str,
         servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars
index 255d4dd8ffa..13daf3fc4c6 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint.handlebars
@@ -157,19 +157,19 @@ class BaseApi(api_client.Api):
 
 {{else}}
     @typing.overload
-    def _{{operationId}}_oapg(
+    def _{{operationId}}(
     {{> endpoint_args isOverload=true skipDeserialization="False" contentType="null"}}
 {{/if}}
 
     @typing.overload
-    def _{{operationId}}_oapg(
+    def _{{operationId}}(
     {{> endpoint_args isOverload=true skipDeserialization="True" contentType="null"}}
 
     @typing.overload
-    def _{{operationId}}_oapg(
+    def _{{operationId}}(
     {{> endpoint_args isOverload=true skipDeserialization="null" contentType="null"}}
 
-    def _{{operationId}}_oapg(
+    def _{{operationId}}(
     {{> endpoint_args isOverload=false skipDeserialization="null" contentType="null"}}
         """
     {{#if summary}}
@@ -180,16 +180,16 @@ class BaseApi(api_client.Api):
             class instances
         """
     {{#if queryParams}}
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
     {{/if}}
     {{#if headerParams}}
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
     {{/if}}
     {{#if pathParams}}
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
     {{/if}}
     {{#if cookieParams}}
-        self._verify_typed_dict_inputs_oapg(RequestCookieParameters.Params, cookie_params)
+        self._verify_typed_dict_inputs(RequestCookieParameters.Params, cookie_params)
     {{/if}}
         used_path = path
     {{#if pathParams}}
@@ -255,7 +255,7 @@ class BaseApi(api_client.Api):
     {{/with}}
     {{#if servers}}
 
-        host = self._get_host_oapg('{{operationId}}', _servers, host_index)
+        host = self._get_host('{{operationId}}', _servers, host_index)
     {{/if}}
 
         response = self.api_client.call_api(
@@ -340,7 +340,7 @@ class {{operationIdCamelCase}}(BaseApi):
 
     def {{operationId}}(
     {{> endpoint_args isOverload=false skipDeserialization="null" contentType="null"}}
-        return self._{{operationId}}_oapg(
+        return self._{{operationId}}(
             {{> endpoint_args_passed }}
         )
 
@@ -371,7 +371,7 @@ class ApiFor{{httpMethod}}(BaseApi):
 
     def {{httpMethod}}(
     {{> endpoint_args isOverload=false skipDeserialization="null" contentType="null"}}
-        return self._{{operationId}}_oapg(
+        return self._{{operationId}}(
             {{> endpoint_args_passed }}
         )
 
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_args_baseapi_wrapper.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_args_baseapi_wrapper.handlebars
index cd73d02e9c8..6660095ca66 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_args_baseapi_wrapper.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_args_baseapi_wrapper.handlebars
@@ -1,5 +1,5 @@
 @typing.overload
 {{#with this}}
-def _{{operationId}}_oapg(
+def _{{operationId}}(
 {{> endpoint_args isOverload=true skipDeserialization="False" contentType=contentType}}
 {{/with}}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test.handlebars
index 7e066b092eb..fb51df23481 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test.handlebars
@@ -22,10 +22,10 @@ class Test{{operationIdSnakeCase}}(ApiTestMixin, unittest.TestCase):
         {{{summary}}}  # noqa: E501
 {{/if}}
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = {{httpMethod}}.ApiFor{{httpMethod}}(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -62,9 +62,9 @@ class Test{{operationIdSnakeCase}}(ApiTestMixin, unittest.TestCase):
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
         {{else}}
@@ -74,7 +74,7 @@ class Test{{operationIdSnakeCase}}(ApiTestMixin, unittest.TestCase):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '{{{path}}}',
+                self.configuration_.host + '{{{path}}}',
                 method='{{httpMethod}}'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -107,9 +107,9 @@ class Test{{operationIdSnakeCase}}(ApiTestMixin, unittest.TestCase):
 {{/with}}
             )
 {{#if valid}}
-            body = {{httpMethod}}.request_body.{{#with schema}}{{#if refModule}}{{refModule}}.{{refClass}}{{else}}{{name.getSnakeCaseName}}.{{name.getCamelCaseName}}{{/if}}{{/with}}.from_openapi_data_oapg(
+            body = {{httpMethod}}.request_body.{{#with schema}}{{#if refModule}}{{refModule}}.{{refClass}}{{else}}{{name.getSnakeCaseName}}.{{name.getCamelCaseName}}{{/if}}{{/with}}.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -121,9 +121,9 @@ class Test{{operationIdSnakeCase}}(ApiTestMixin, unittest.TestCase):
             assert isinstance(api_response.body, schemas.Unset)
 {{else}}
             with self.assertRaises(({{packageName}}.ApiValueError, {{packageName}}.ApiTypeError)):
-                body = {{httpMethod}}.request_body.{{#with schema}}{{#if refModule}}{{refModule}}.{{refClass}}{{else}}{{name.getSnakeCaseName}}.{{name.getCamelCaseName}}{{/if}}{{/with}}.from_openapi_data_oapg(
+                body = {{httpMethod}}.request_body.{{#with schema}}{{#if refModule}}{{refModule}}.{{refClass}}{{else}}{{name.getSnakeCaseName}}.{{name.getCamelCaseName}}{{/if}}{{/with}}.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.{{httpMethod}}(body=body)
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test_partial.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test_partial.handlebars
index 432b428ee5a..b1ec9772f12 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test_partial.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/endpoint_test_partial.handlebars
@@ -9,7 +9,7 @@ api_response = self.api.{{httpMethod}}(
 )
 self.assert_pool_manager_request_called_with(
     mock_request,
-    self._configuration.host + '{{{path}}}',
+    self.configuration_.host + '{{{path}}}',
     method='{{httpMethod}}'.upper(),
 {{#if requestBody}}
     body=self.json_bytes(payload),
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
index 3e74c338d07..abc6fdbb693 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/new.handlebars
@@ -1,12 +1,12 @@
 def __new__(
     cls,
 {{#if getHasMultipleTypes}}
-    *_args: typing.Union[{{> model_templates/schema_python_types }}],
+    *args_: typing.Union[{{> model_templates/schema_python_types }}],
 {{else}}
 {{#if isArray }}
-    _arg: typing.Union[typing.Tuple[{{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}typing.Union[MetaOapg.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}typing.Union[MetaOapg.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
+    arg_: typing.Union[typing.Tuple[{{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}typing.Union[Schema_.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}], typing.List[{{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}typing.Union[Schema_.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}]{{/if}}{{/with}}]],
 {{else}}
-    *_args: typing.Union[{{> model_templates/schema_python_types }}],
+    *args_: typing.Union[{{> model_templates/schema_python_types }}],
 {{/if}}
 {{/if}}
 {{#unless isNull}}
@@ -19,9 +19,9 @@ def __new__(
 {{else}}
     {{#if name}}
         {{#if schemaIsFromAdditionalProperties}}
-    {{@key.getName}}: typing.Union[MetaOapg.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
+    {{@key.getName}}: typing.Union[Schema_.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
         {{else}}
-    {{@key.getName}}: typing.Union[MetaOapg.Properties.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
+    {{@key.getName}}: typing.Union[Schema_.Properties.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
         {{/if}}
     {{else}}
     {{@key.getName}}: typing.Union[schemas.AnyTypeSchema, {{> model_templates/schema_python_types }}],
@@ -37,17 +37,17 @@ def __new__(
 {{#if refClass}}
     {{@key.getName}}: typing.Union['{{> refclass_with_module }}', schemas.Unset] = schemas.unset,
 {{else}}
-    {{@key.getName}}: typing.Union[MetaOapg.Properties.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}schemas.Unset] = schemas.unset,
+    {{@key.getName}}: typing.Union[Schema_.Properties.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}schemas.Unset] = schemas.unset,
 {{/if}}
 {{/if}}
 {{/each}}
-    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
 {{#with additionalProperties}}
 {{#unless getIsBooleanSchemaFalse}}
 {{#if refClass}}
     **kwargs: '{{> refclass_with_module }}',
 {{else}}
-    **kwargs: typing.Union[MetaOapg.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
+    **kwargs: typing.Union[Schema_.{{name.getCamelCaseName}}, {{> model_templates/schema_python_types }}],
 {{/if}}
 {{/unless}}
 {{else}}
@@ -59,12 +59,12 @@ def __new__(
     return super().__new__(
         cls,
 {{#if getHasMultipleTypes}}
-        *_args,
+        *args_,
 {{else}}
 {{#if isArray }}
-        _arg,
+        arg_,
 {{else}}
-        *_args,
+        *args_,
 {{/if}}
 {{/if}}
 {{#unless isNull}}
@@ -83,7 +83,7 @@ def __new__(
         {{@key.getName}}={{@key.getName}},
 {{/if}}
 {{/each}}
-        _configuration=_configuration,
+        configuration_=configuration_,
 {{#with additionalProperties}}
 {{#unless getIsBooleanSchemaFalse}}
         **kwargs,
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitem.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitem.handlebars
index f0a99a71128..9d83c29422c 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitem.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitem.handlebars
@@ -17,7 +17,7 @@ def {{methodName}}(
         str
 {{/with}}
     ]
-){{#not properties}}{{#not getRequiredProperties}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
+){{#not properties}}{{#not getRequiredProperties}}{{#with additionalProperties}}{{#unless getIsBooleanSchemaFalse}} -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getName}}{{/if}}{{/unless}}{{/with}}{{/not}}{{/not}}:
 {{#eq methodName "__getitem__"}}
     # dict_instance[name] accessor
 {{/eq}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems.handlebars
index 70d17cc2c9a..b3981981876 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_getitems.handlebars
@@ -8,9 +8,9 @@ def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) ->
 {{else}}
     {{#if name}}
         {{#if schemaIsFromAdditionalProperties}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> MetaOapg.{{name.getCamelCaseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> Schema_.{{name.getCamelCaseName}}: ...
         {{else}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> MetaOapg.Properties.{{name.getCamelCaseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> Schema_.Properties.{{name.getCamelCaseName}}: ...
         {{/if}}
     {{else}}
 def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> schemas.AnyTypeSchema: ...
@@ -26,7 +26,7 @@ def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) ->
 {{#if refClass}}
 def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> '{{> refclass_with_module }}': ...
 {{else}}
-def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> MetaOapg.Properties.{{name.getCamelCaseName}}: ...
+def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> Schema_.Properties.{{name.getCamelCaseName}}: ...
 {{/if}}
 {{/each}}
 {{/if}}
@@ -35,7 +35,7 @@ def __getitem__(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) ->
         {{#unless getIsBooleanSchemaFalse}}
 
 @typing.overload
-def __getitem__(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getCamelCaseName}}{{/if}}: ...
+def __getitem__(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getCamelCaseName}}{{/if}}: ...
         {{/unless}}
     {{else}}
 
@@ -48,7 +48,7 @@ def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
     {{#with additionalProperties}}
         {{#unless getIsBooleanSchemaFalse}}
 
-def __getitem__(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getCamelCaseName}}{{/if}}:
+def __getitem__(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getCamelCaseName}}{{/if}}:
     # dict_instance[name] accessor
     return super().__getitem__(name)
         {{/unless}}
@@ -60,16 +60,16 @@ def __getitem__(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}
 
 @typing.overload
 {{#if refClass}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> '{{> refclass_with_module }}': ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> '{{> refclass_with_module }}': ...
 {{else}}
     {{#if name}}
         {{#if schemaIsFromAdditionalProperties}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> MetaOapg.{{name.getCamelCaseName}}: ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> Schema_.{{name.getCamelCaseName}}: ...
         {{else}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> MetaOapg.Properties.{{name.getCamelCaseName}}: ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> Schema_.Properties.{{name.getCamelCaseName}}: ...
         {{/if}}
     {{else}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> schemas.AnyTypeSchema: ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> schemas.AnyTypeSchema: ...
     {{/if}}
 {{/if}}
 {{/with}}
@@ -80,9 +80,9 @@ def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -
 
 @typing.overload
 {{#if refClass}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> typing.Union['{{> refclass_with_module }}', schemas.Unset]: ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> typing.Union['{{> refclass_with_module }}', schemas.Unset]: ...
 {{else}}
-def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> typing.Union[MetaOapg.Properties.{{name.getCamelCaseName}}, schemas.Unset]: ...
+def get_item_(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -> typing.Union[Schema_.Properties.{{name.getCamelCaseName}}, schemas.Unset]: ...
 {{/if}}
 {{/each}}
 {{/if}}
@@ -91,21 +91,21 @@ def get_item_oapg(self, name: typing_extensions.Literal["{{{@key.getName}}}"]) -
         {{#unless getIsBooleanSchemaFalse}}
 
 @typing.overload
-def get_item_oapg(self, name: str) -> typing.Union[{{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getCamelCaseName}}{{/if}}, schemas.Unset]: ...
+def get_item_(self, name: str) -> typing.Union[{{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getCamelCaseName}}{{/if}}, schemas.Unset]: ...
         {{/unless}}
     {{else}}
 
 @typing.overload
-def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     {{/with}}
 
-{{> model_templates/property_getitem methodName="get_item_oapg" }}
+{{> model_templates/property_getitem methodName="get_item_" }}
 {{else}}
     {{#with additionalProperties}}
         {{#unless getIsBooleanSchemaFalse}}
 
-def get_item_oapg(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getCamelCaseName}}{{/if}}:
-    return super().get_item_oapg(name)
+def get_item_(self, name: str) -> {{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getCamelCaseName}}{{/if}}:
+    return super().get_item_(name)
         {{/unless}}
     {{/with}}
 {{/or}}
\ No newline at end of file
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
index 356596a601c..299d1b2198d 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/property_type_hints_required.handlebars
@@ -6,9 +6,9 @@
 {{else}}
     {{#if name}}
         {{#if schemaIsFromAdditionalProperties}}
-{{@key.getName}}: MetaOapg.{{name.getCamelCaseName}}
+{{@key.getName}}: Schema_.{{name.getCamelCaseName}}
         {{else}}
-{{@key.getName}}: MetaOapg.Properties.{{name.getCamelCaseName}}
+{{@key.getName}}: Schema_.Properties.{{name.getCamelCaseName}}
         {{/if}}
     {{else}}
 {{@key.getName}}: schemas.AnyTypeSchema
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_composed_or_anytype.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_composed_or_anytype.handlebars
index c2b3a694010..795d21c3462 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_composed_or_anytype.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_composed_or_anytype.handlebars
@@ -23,7 +23,7 @@ class {{name.getCamelCaseName}}(
 {{/if}}
 
 
-    class MetaOapg:
+    class Schema_:
 {{#if isAnyType}}
         # any type
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_dict.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_dict.handlebars
index 6145436ced3..4819865c8d5 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_dict.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_dict.handlebars
@@ -18,14 +18,14 @@ class {{name.getCamelCaseName}}(
 {{#or additionalProperties getRequiredProperties getHasDiscriminatorWithNonEmptyMapping properties}}
 
 
-    class MetaOapg:
+    class Schema_:
         {{> model_templates/dict_partial }}
 {{/or}}
 {{else}}
 {{#or additionalProperties getRequiredProperties getHasDiscriminatorWithNonEmptyMapping properties hasValidation}}
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         {{> model_templates/dict_partial }}
         {{> model_templates/validations }}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
index de72b78733b..fa84199f1b2 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_list.handlebars
@@ -17,7 +17,7 @@ class {{name.getCamelCaseName}}(
 {{#or getItems hasValidation}}
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
 {{#if hasValidation}}
         {{> model_templates/validations }}
@@ -27,5 +27,5 @@ class {{name.getCamelCaseName}}(
 
     {{> model_templates/new }}
 
-    def __getitem__(self, i: int) -> {{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}MetaOapg.{{name.getCamelCaseName}}{{/if}}{{/with}}:
+    def __getitem__(self, i: int) -> {{#with items}}{{#if refClass}}'{{> refclass_with_module }}'{{else}}Schema_.{{name.getCamelCaseName}}{{/if}}{{/with}}:
         return super().__getitem__(i)
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_simple.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_simple.handlebars
index c1694499654..7a16e14097f 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_simple.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_simple.handlebars
@@ -18,7 +18,7 @@ class {{name.getCamelCaseName}}(
 {{#or hasValidation isEnum getFormat}}
 
 
-    class MetaOapg:
+    class Schema_:
 {{#if isAnyType}}
         # any type
 {{/if}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/model_test.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/model_test.handlebars
index 64bb92cc908..0049318fe7b 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/model_test.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/model_test.handlebars
@@ -12,26 +12,26 @@ from {{packageName}} import configuration
 
 class Test{{name.getCamelCaseName}}(unittest.TestCase):
     """{{name.getCamelCaseName}} unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 {{#each testCases}}
 {{#with this }}
     def test_{{@key}}_{{#if valid}}passes{{else}}fails{{/if}}(self):
         # {{description}}
 {{#if valid}}
-        {{name.getCamelCaseName}}.from_openapi_data_oapg(
+        {{name.getCamelCaseName}}.from_openapi_data_(
 {{#with data}}
             {{> model_templates/payload_renderer endChar=',' }}
 {{/with}}
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 {{else}}
         with self.assertRaises(({{packageName}}.ApiValueError, {{packageName}}.ApiTypeError)):
-            {{name.getCamelCaseName}}.from_openapi_data_oapg(
+            {{name.getCamelCaseName}}.from_openapi_data_(
 {{#with data}}
                 {{> model_templates/payload_renderer endChar=','}}
 {{/with}}
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 {{/if}}
 {{/with}}
diff --git a/modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars b/modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars
index 937b17ae46c..4767c290a4c 100644
--- a/modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars
+++ b/modules/openapi-json-schema-generator/src/main/resources/python/schemas.handlebars
@@ -39,17 +39,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     """
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
-            if _arg.closed:
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(arg_, (io.FileIO, io.BufferedReader)):
+            if arg_.closed:
                 raise exceptions.ApiValueError('Invalid file state; file is closed and must be open')
-            _arg.close()
-            inst = super(FileIO, cls).__new__(cls, _arg.name)
-            super(FileIO, inst).__init__(_arg.name)
+            arg_.close()
+            inst = super(FileIO, cls).__new__(cls, arg_.name)
+            super(FileIO, inst).__init__(arg_.name)
             return inst
-        raise exceptions.ApiValueError('FileIO must be passed _arg which contains the open file')
+        raise exceptions.ApiValueError('FileIO must be passed arg_ which contains the open file')
 
-    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, arg_: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -143,11 +143,11 @@ def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_t
 class Singleton:
     """
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, _arg)
+    The same instance is returned for a given key of (cls, arg_)
     """
     _instances = {}
 
-    def __new__(cls, _arg: typing.Any, **kwargs):
+    def __new__(cls, arg_: typing.Any, **kwargs):
         """
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -155,15 +155,15 @@ class Singleton:
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of arg_ ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         """
-        key = (cls, _arg, str(_arg))
+        key = (cls, arg_, str(arg_))
         if key not in cls._instances:
-            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(arg_, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, _arg)
+                cls._instances[key] = super().__new__(cls, arg_)
         return cls._instances[key]
 
     def __repr__(self):
@@ -211,7 +211,7 @@ class BoolClass(Singleton):
         raise ValueError('Unable to find the boolean value of this instance')
 
 
-class MetaOapgTyped:
+class SchemaTyped:
     types: typing.Optional[typing.Set[typing.Type]]
     exclusive_maximum: typing.Union[int, float]
     inclusive_maximum: typing.Union[int, float]
@@ -323,7 +323,7 @@ def validate_enum(
     return None
 
 
-def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+def _raise_validation_error_message(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
     raise exceptions.ApiValueError(
         "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
             value=value,
@@ -347,7 +347,7 @@ def validate_unique_items(
     if not unique_items_value or not isinstance(arg, tuple):
         return None
     if len(arg) > len(set(arg)):
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
             constraint_value='unique_items==True',
@@ -368,7 +368,7 @@ def validate_min_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) < min_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be greater than or equal to",
             constraint_value=min_items,
@@ -389,7 +389,7 @@ def validate_max_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) > max_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be less than or equal to",
             constraint_value=max_items,
@@ -410,7 +410,7 @@ def validate_min_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) < min_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be greater than or equal to",
             constraint_value=min_properties,
@@ -431,7 +431,7 @@ def validate_max_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) > max_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be less than or equal to",
             constraint_value=max_properties,
@@ -452,7 +452,7 @@ def validate_min_length(
     if not isinstance(arg, str):
         return None
     if len(arg) < min_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be greater than or equal to",
             constraint_value=min_length,
@@ -473,7 +473,7 @@ def validate_max_length(
     if not isinstance(arg, str):
         return None
     if len(arg) > max_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be less than or equal to",
             constraint_value=max_length,
@@ -494,7 +494,7 @@ def validate_inclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg < inclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than or equal to",
             constraint_value=inclusive_minimum,
@@ -515,7 +515,7 @@ def validate_exclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg <= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than",
             constraint_value=exclusive_minimum,
@@ -536,7 +536,7 @@ def validate_inclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg > inclusive_maximum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than or equal to",
             constraint_value=inclusive_maximum,
@@ -557,7 +557,7 @@ def validate_exclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg >= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than",
             constraint_value=exclusive_maximum,
@@ -578,7 +578,7 @@ def validate_multiple_of(
         return None
     if (not (float(arg) / multiple_of).is_integer()):
         # Note 'multipleOf' will be as good as the floating point arithmetic.
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="value must be a multiple of",
             constraint_value=multiple_of,
@@ -603,14 +603,14 @@ def validate_regex(
         if flags != 0:
             # Don't print the regex flags if the flags are not
             # specified in the OAS document.
-            _raise_validation_error_message_oapg(
+            _raise_validation_error_message(
                 value=arg,
                 constraint_msg="must match regular expression",
                 constraint_value=regex_dict['pattern'],
                 path_to_item=validation_metadata.path_to_item,
                 additional_txt=" with flags=`{}`".format(flags)
             )
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must match regular expression",
             constraint_value=regex_dict['pattern'],
@@ -799,7 +799,7 @@ def validate_required(
     return None
 
 
-def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+def _get_class(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
     if isinstance(item_cls, types.FunctionType):
         # referenced schema
         return item_cls()
@@ -820,7 +820,7 @@ def validate_items(
 ) -> PathToSchemasType:
     if not isinstance(arg, tuple):
         return None
-    item_cls = _get_class_oapg(item_cls)
+    item_cls = _get_class(item_cls)
     path_to_schemas = {}
     for i, value in enumerate(arg):
         item_validation_metadata = ValidationMetadata(
@@ -831,7 +831,7 @@ def validate_items(
         if item_validation_metadata.validation_ran_earlier(item_cls):
             add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = item_cls._validate_oapg(
+        other_path_to_schemas = item_cls._validate(
             value, validation_metadata=item_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
@@ -853,7 +853,7 @@ def validate_properties(
     for property_name, value in present_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
         schema = properties.__annotations__[property_name]
-        schema = _get_class_oapg(schema)
+        schema = _get_class(schema)
         arg_validation_metadata = ValidationMetadata(
             path_to_item=path_to_item,
             configuration=validation_metadata.configuration,
@@ -862,7 +862,7 @@ def validate_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -878,9 +878,9 @@ def validate_additional_properties(
 ) -> typing.Optional[PathToSchemasType]:
     if not isinstance(arg, frozendict.frozendict):
         return None
-    schema = _get_class_oapg(additional_properties_schema)
+    schema = _get_class(additional_properties_schema)
     path_to_schemas = {}
-    properties_annotations = cls.MetaOapg.Properties.__annotations__ if hasattr(cls.MetaOapg, 'Properties') else {}
+    properties_annotations = cls.Schema_.Properties.__annotations__ if hasattr(cls.Schema_, 'Properties') else {}
     present_additional_properties = {k: v for k, v, in arg.items() if k not in properties_annotations}
     for property_name, value in present_additional_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
@@ -892,7 +892,7 @@ def validate_additional_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -910,14 +910,14 @@ def validate_one_of(
     oneof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for one_of_cls in one_of_container_cls.classes:
-        schema = _get_class_oapg(one_of_cls)
+        schema = _get_class(one_of_cls)
         if schema in path_to_schemas[validation_metadata.path_to_item]:
             oneof_classes.append(schema)
             continue
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             oneof_classes.append(schema)
             continue
@@ -926,7 +926,7 @@ def validate_one_of(
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
         try:
-            path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate oneof_classes
             continue
@@ -974,11 +974,11 @@ def validate_any_of(
     anyof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for any_of_cls in any_of_container_cls.classes:
-        schema = _get_class_oapg(any_of_cls)
+        schema = _get_class(any_of_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             anyof_classes.append(schema)
             continue
@@ -988,7 +988,7 @@ def validate_any_of(
             continue
 
         try:
-            other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate anyof_classes
             continue
@@ -1021,17 +1021,17 @@ def validate_all_of(
 ) -> PathToSchemasType:
     path_to_schemas = collections.defaultdict(set)
     for allof_cls in all_of_cls.classes:
-        schema = _get_class_oapg(allof_cls)
+        schema = _get_class(allof_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             continue
         if validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -1045,7 +1045,7 @@ def validate_not(
     **kwargs
 {{/if}}
 ) -> None:
-    not_schema = _get_class_oapg(not_cls)
+    not_schema = _get_class(not_cls)
     other_path_to_schemas = None
     not_exception = exceptions.ApiValueError(
         "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
@@ -1058,7 +1058,7 @@ def validate_not(
         raise not_exception
 
     try:
-        other_path_to_schemas = not_schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = not_schema._validate(arg, validation_metadata=validation_metadata)
     except (exceptions.ApiValueError, exceptions.ApiTypeError):
         pass
     if other_path_to_schemas:
@@ -1083,38 +1083,38 @@ def __get_discriminated_class(cls, disc_property_name: str, disc_payload_value:
     """
     Used in schemas with discriminators
     """
-    if not hasattr(cls.MetaOapg, 'discriminator'):
+    if not hasattr(cls.Schema_, 'discriminator'):
         return None
-    disc = cls.MetaOapg.discriminator()
+    disc = cls.Schema_.discriminator()
     if disc_property_name not in disc:
         return None
     discriminated_cls = disc[disc_property_name].get(disc_payload_value)
     if discriminated_cls is not None:
         return discriminated_cls
     if not (
-        hasattr(cls.MetaOapg, 'AllOf') or
-        hasattr(cls.MetaOapg, 'OneOf') or
-        hasattr(cls.MetaOapg, 'AnyOf')
+        hasattr(cls.Schema_, 'AllOf') or
+        hasattr(cls.Schema_, 'OneOf') or
+        hasattr(cls.Schema_, 'AnyOf')
     ):
         return None
     # TODO stop traveling if a cycle is hit
-    if hasattr(cls.MetaOapg, 'AllOf'):
-        for allof_cls in cls.MetaOapg.AllOf.classes:
-            allof_cls = _get_class_oapg(allof_cls)
+    if hasattr(cls.Schema_, 'AllOf'):
+        for allof_cls in cls.Schema_.AllOf.classes:
+            allof_cls = _get_class(allof_cls)
             discriminated_cls = __get_discriminated_class(
                 allof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'OneOf'):
-        for oneof_cls in cls.MetaOapg.OneOf.classes:
-            oneof_cls = _get_class_oapg(oneof_cls)
+    if hasattr(cls.Schema_, 'OneOf'):
+        for oneof_cls in cls.Schema_.OneOf.classes:
+            oneof_cls = _get_class(oneof_cls)
             discriminated_cls = __get_discriminated_class(
                 oneof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'AnyOf'):
-        for anyof_cls in cls.MetaOapg.AnyOf.classes:
-            anyof_cls = _get_class_oapg(anyof_cls)
+    if hasattr(cls.Schema_, 'AnyOf'):
+        for anyof_cls in cls.Schema_.AnyOf.classes:
+            anyof_cls = _get_class(anyof_cls)
             discriminated_cls = __get_discriminated_class(
                 anyof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
@@ -1129,7 +1129,7 @@ def _get_discriminated_class_and_exception(
 ) -> typing.Tuple[typing.Optional['Schema'], typing.Optional[Exception]]:
     if not isinstance(arg, frozendict.frozendict):
         return None, None
-    discriminator = cls.MetaOapg.discriminator()
+    discriminator = cls.Schema_.discriminator()
     disc_prop_name = list(discriminator.keys())[0]
     try:
         __ensure_discriminator_value_present(disc_prop_name, validation_metadata, arg)
@@ -1179,7 +1179,7 @@ def validate_discriminator(
     if discriminated_cls is cls:
         """
         Optimistically assume that cls will pass validation
-        If the code invoked _validate_oapg on cls it would infinitely recurse
+        If the code invoked _validate on cls it would infinitely recurse
         """
         return None
     if validation_metadata.validation_ran_earlier(discriminated_cls):
@@ -1192,7 +1192,7 @@ def validate_discriminator(
         seen_classes=validation_metadata.seen_classes | frozenset({cls}),
         validated_path_to_schemas=validation_metadata.validated_path_to_schemas
     )
-    return discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
+    return discriminated_cls._validate(arg, validation_metadata=updated_vm)
 
 
 json_schema_keyword_to_validator = {
@@ -1233,7 +1233,7 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
     __excluded_cls_properties = {
         '__module__',
         '__dict__',
@@ -1242,7 +1242,7 @@ class Schema:
     }
 
     @classmethod
-    def _validate_oapg(
+    def _validate(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
@@ -1254,7 +1254,7 @@ class Schema:
         """
         json_schema_data = {
             k: v
-            for k, v in vars(cls.MetaOapg).items()
+            for k, v in vars(cls.Schema_).items()
             if k not in cls.__excluded_cls_properties
             and k
             not in validation_metadata.configuration.disabled_json_schema_python_keywords
@@ -1296,7 +1296,7 @@ class Schema:
         return path_to_schemas
 
     @staticmethod
-    def _process_schema_classes_oapg(
+    def _process_schema_classes(
         schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
     ):
         """
@@ -1345,21 +1345,21 @@ class Schema:
 
         Dict property + List Item Assignment Use cases:
         1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
+            the value is validated by _validate
+            _validate returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
         2. value is an instance of the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
+            the value is NOT validated by _validate, _validate only checks that the instance is of the correct schema type
+            for this value, _validate does NOT return an entry for it in _path_to_schemas
+            and in list/dict _get_items,_get_properties the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         """
         _path_to_schemas = {}
         if validation_metadata.validation_ran_earlier(cls):
             add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
         else:
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
         # do not modify the returned result because it is cached and we would be modifying the cached value
@@ -1373,9 +1373,9 @@ class Schema:
                 Singleton already added
             3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
             """
-            cls._process_schema_classes_oapg(schema_classes)
+            cls._process_schema_classes(schema_classes)
             enum_schema = any(
-                issubclass(this_cls, Schema) and hasattr(this_cls.MetaOapg, "enum_value_to_name")
+                issubclass(this_cls, Schema) and hasattr(this_cls.Schema_, "enum_value_to_name")
                 for this_cls in schema_classes
             )
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
@@ -1403,7 +1403,7 @@ class Schema:
         return path_to_schemas
 
     @classmethod
-    def _get_new_instance_without_conversion_oapg(
+    def _get_new_instance_without_conversion(
         cls,
         arg: typing.Any,
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
@@ -1411,10 +1411,10 @@ class Schema:
     ):
         # We have a Dynamic class and we are making an instance of it
         if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
+            properties = cls._get_properties(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, properties)
         elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
+            items = cls._get_items(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, items)
         """
         str = openapi str, datetime.date, and datetime.datetime
@@ -1425,7 +1425,7 @@ class Schema:
         return super(Schema, cls).__new__(cls, arg)
 
     @classmethod
-    def from_openapi_data_oapg(
+    def from_openapi_data_(
         cls,
         arg: typing.Union[
             str,
@@ -1439,10 +1439,10 @@ class Schema:
             io.BufferedReader,
             bytes
         ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None
+        configuration_: typing.Optional[configuration_module.Configuration] = None
     ):
         """
-        Schema from_openapi_data_oapg
+        Schema from_openapi_data_
         """
         from_server = True
         validated_path_to_schemas = {}
@@ -1450,12 +1450,12 @@ class Schema:
         arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas, ('args[0]',), path_to_type)
         validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(validated_path_to_schemas)
         )
         path_to_schemas = cls.__get_new_cls(arg, validation_metadata, path_to_type)
         new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
+        new_inst = new_cls._get_new_instance_without_conversion(
             arg,
             validation_metadata.path_to_item,
             path_to_schemas
@@ -1477,10 +1477,10 @@ class Schema:
 
     def __new__(
         cls,
-        *_args: typing.Union[
+        *args_: typing.Union[
             {{> types_all_incl_schema }}
         ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             {{> types_all_incl_schema }}
             Unset
@@ -1490,23 +1490,23 @@ class Schema:
         Schema __new__
 
         Args:
-            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            args_ (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the configuration_module.Configuration that enables json schema validation keywords
+            configuration_: contains the configuration_module.Configuration that enables json schema validation keywords
                 like minItems, minLength etc
 
         Note: double underscores are used here because pycharm thinks that these variables
         are instance properties if they are named normally :(
         """
         __kwargs = cls.__remove_unsets(kwargs)
-        if not _args and not __kwargs:
+        if not args_ and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and _args and not isinstance(_args[0], dict):
-            __arg = _args[0]
+        if not __kwargs and args_ and not isinstance(args_[0], dict):
+            __arg = args_[0]
         else:
-            __arg = cls.__get_input_dict(*_args, **__kwargs)
+            __arg = cls.__get_input_dict(*args_, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __path_to_type = {}
@@ -1514,12 +1514,12 @@ class Schema:
             __arg, __from_server, __validated_path_to_schemas, ('args[0]',), __path_to_type)
         __validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(__validated_path_to_schemas)
         )
         __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata, __path_to_type)
         __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
+        return __new_cls._get_new_instance_without_conversion(
             __arg,
             __validation_metadata.path_to_item,
             __path_to_schemas
@@ -1527,9 +1527,9 @@ class Schema:
 
     def __init__(
         self,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
@@ -1840,7 +1840,7 @@ else:
 
 
 class BoolBase:
-    def is_true_oapg(self) -> bool:
+    def is_true_(self) -> bool:
         """
         A replacement for x is True
         True if the instance is a BoolClass True Singleton
@@ -1849,7 +1849,7 @@ class BoolBase:
             return False
         return bool(self)
 
-    def is_false_oapg(self) -> bool:
+    def is_false_(self) -> bool:
         """
         A replacement for x is False
         True if the instance is a BoolClass False Singleton
@@ -1860,7 +1860,7 @@ class BoolBase:
 
 
 class NoneBase:
-    def is_none_oapg(self) -> bool:
+    def is_none_(self) -> bool:
         """
         A replacement for x is None
         True if the instance is a NoneClass None Singleton
@@ -1871,47 +1871,47 @@ class NoneBase:
 
 
 class StrBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_str_oapg(self) -> str:
+    def as_str_(self) -> str:
         return self
 
     @property
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         raise Exception('not implemented')
 
     @property
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         raise Exception('not implemented')
 
     @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         raise Exception('not implemented')
 
     @property
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         raise Exception('not implemented')
 
 
 class UUIDBase:
     @property
     @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         return uuid.UUID(self)
 
 
 class DateBase:
     @property
     @functools.lru_cache()
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
 
 class DateTimeBase:
     @property
     @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
 
@@ -1924,15 +1924,15 @@ class DecimalBase:
 
     @property
     @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
 
 class NumberBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -1952,7 +1952,7 @@ class NumberBase:
             return self._as_int
 
     @property
-    def as_float_oapg(self) -> float:
+    def as_float_(self) -> float:
         try:
             return self._as_float
         except AttributeError:
@@ -1963,24 +1963,24 @@ class NumberBase:
 
 
 class ListBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @classmethod
-    def _get_items_oapg(
+    def _get_items(
         cls: 'Schema',
         arg: typing.List[typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         '''
-        ListBase _get_items_oapg
+        ListBase _get_items
         '''
         cast_items = []
 
         for i, value in enumerate(arg):
             item_path_to_item = path_to_item + (i,)
             item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
+            new_value = item_cls._get_new_instance_without_conversion(
                 value,
                 item_path_to_item,
                 path_to_schemas
@@ -1992,14 +1992,14 @@ class ListBase:
 
 class DictBase:
     @classmethod
-    def _get_properties_oapg(
+    def _get_properties(
         cls,
         arg: typing.Dict[str, typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         """
-        DictBase _get_properties_oapg, this is how properties are set
+        DictBase _get_properties, this is how properties are set
         These values already passed validation
         """
         dict_items = {}
@@ -2007,7 +2007,7 @@ class DictBase:
         for property_name_js, value in arg.items():
             property_path_to_item = path_to_item + (property_name_js,)
             property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
+            new_value = property_cls._get_new_instance_without_conversion(
                 value,
                 property_path_to_item,
                 path_to_schemas
@@ -2036,7 +2036,7 @@ class DictBase:
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+    def get_item_(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
         # dict_instance[name] accessor
         if not isinstance(self, frozendict.frozendict):
             raise NotImplementedError()
@@ -2172,15 +2172,15 @@ class ListSchema(
     Schema,
     TupleMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.List[typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NoneSchema(
@@ -2188,15 +2188,15 @@ class NoneSchema(
     Schema,
     NoneMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: None, **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: None, **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NumberSchema(
@@ -2208,20 +2208,20 @@ class NumberSchema(
     This is used for type: number with no format
     Both integers AND floats are accepted
     """
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Union[int, float], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class IntBase:
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -2230,22 +2230,22 @@ class IntBase:
 
 
 class IntSchema(IntBase, NumberSchema):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: int, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class Int32Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int32'
 
@@ -2253,7 +2253,7 @@ class Int32Schema(
 class Int64Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int64'
 
@@ -2261,25 +2261,25 @@ class Int64Schema(
 class Float32Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'float'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class Float64Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'double'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class StrSchema(
@@ -2293,50 +2293,50 @@ class StrSchema(
     - type: string (format unset)
     - type: string, format: date
     """
-    class MetaOapg:
+    class Schema_:
         types = {str}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'number'
 
-    def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
+    def __new__(cls, arg_: str, **kwargs: configuration_module.Configuration):
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2345,7 +2345,7 @@ class DecimalSchema(DecimalBase, StrSchema):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         """
-        return super().__new__(cls, _arg, **kwargs)
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class BytesSchema(
@@ -2355,11 +2355,11 @@ class BytesSchema(
     """
     this class will subclass bytes and is immutable
     """
-    class MetaOapg:
+    class Schema_:
         types = {bytes}
 
-    def __new__(cls, _arg: bytes, **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: bytes, **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class FileSchema(
@@ -2382,18 +2382,18 @@ class FileSchema(
     - to allow file reading and writing to disk
     - to be able to preserve file name info
     """
-    class MetaOapg:
+    class Schema_:
         types = {FileIO}
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class BinarySchema(
     Schema,
     BinaryMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {FileIO, bytes}
         format = 'binary'
 
@@ -2403,8 +2403,8 @@ class BinarySchema(
                 FileSchema,
             ]
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_)
 
 
 class BoolSchema(
@@ -2412,15 +2412,15 @@ class BoolSchema(
     Schema,
     BoolMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {BoolClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: bool, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class AnyTypeSchema(
@@ -2434,7 +2434,7 @@ class AnyTypeSchema(
     NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
-    class MetaOapg:
+    class Schema_:
         pass
 
 
@@ -2450,18 +2450,18 @@ class NotAnyTypeSchema(AnyTypeSchema):
     Note: validations on this class are never run because the code knows that no inputs will ever validate
     """
 
-    class MetaOapg:
+    class Schema_:
         _not = AnyTypeSchema
 
     def __new__(
         cls,
-        *_args,
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        *args_,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
 
 
@@ -2470,15 +2470,15 @@ class DictSchema(
     Schema,
     FrozenDictMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *_args, **kwargs)
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
+        return super().__new__(cls, *args_, **kwargs)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/README.md b/samples/openapi3/client/3_0_3_unit_test/python/README.md
index 38b57c81f64..e3985b76837 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/README.md
+++ b/samples/openapi3/client/3_0_3_unit_test/python/README.md
@@ -27,25 +27,25 @@ Python &gt;&#x3D;3.7
         - ingested None will subclass NoneClass
         - ingested True will subclass BoolClass
         - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
+        - So if you need to check is True/False/None, instead use instance.is_true_()/.is_false_()/.is_none_()
 5. All validated class instances are immutable except for ones based on io.File
     - This is because if properties were changed after validation, that validation would no longer apply
     - So no changing values or property values after a class has been instantiated
 6. String + Number types with formats
     - String type data is stored as a string and if you need to access types based on its format like date,
     date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
+    - type string + format: See .as_date_, .as_datetime_, .as_decimal_, .as_uuid_
+    - type number + format: See .as_float_, .as_int_
     - this was done because openapi/json-schema defines constraints. string data may be type string with no format
     keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
+    - So if you need to access a string format based type, use as_date_/as_datetime_/as_decimal_/as_uuid_
+    - So if you need to access a number format based type, use as_int_/as_float_
 7. Property access on AnyType(type unset) or object(dict) schemas
     - Only required keys with valid python names are properties like .someProp and have type hints
     - All optional keys may not exist, so properties are not defined for them
     - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+    - Use get_item_ if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_('optionalProp')
         - All required and optional keys have type hints for this method, and @typing.overload is used
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
@@ -61,19 +61,18 @@ Python &gt;&#x3D;3.7
     - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
     - So you will need to update your import paths to the api classes
 
-### Why are Oapg and _oapg used in class and method names?
+### Why are Leading and Trailing Underscores in class and method names?
 Classes can have arbitrarily named properties set on them
 Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
+For those reasons, I use the prefix and suffix _ to greatly reduce the likelihood of collisions
 on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
 
 ### Object property spec case
 This was done because when payloads are ingested, they can be validated against N number of schemas.
 If the input signature used a different property name then that has mutated the payload.
 So SchemaA and SchemaB must both see the camelCase spec named variable.
 Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
+That use case should work, so spec case is used.
 
 ### Parameter spec case
 Parameters can be included in different locations including:
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test__not.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test__not.py
index 424b566a1ad..ca0630b412e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test__not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test__not.py
@@ -18,21 +18,21 @@
 
 class Test_Not(unittest.TestCase):
     """_Not unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_allowed_passes(self):
         # allowed
-        _Not.from_openapi_data_oapg(
+        _Not.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_disallowed_fails(self):
         # disallowed
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            _Not.from_openapi_data_oapg(
+            _Not.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_allows_a_schema_which_should_validate.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_allows_a_schema_which_should_validate.py
index f62119c83d9..71b346078ee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_allows_a_schema_which_should_validate.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_allows_a_schema_which_should_validate.py
@@ -18,22 +18,22 @@
 
 class TestAdditionalpropertiesAllowsASchemaWhichShouldValidate(unittest.TestCase):
     """AdditionalpropertiesAllowsASchemaWhichShouldValidate unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_no_additional_properties_is_valid_passes(self):
         # no additional properties is valid
-        AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+        AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
             {
                 "foo":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_additional_invalid_property_is_invalid_fails(self):
         # an additional invalid property is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+            AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
                 {
                     "foo":
                         1,
@@ -42,12 +42,12 @@ def test_an_additional_invalid_property_is_invalid_fails(self):
                     "quux":
                         12,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_additional_valid_property_is_valid_passes(self):
         # an additional valid property is valid
-        AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+        AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
             {
                 "foo":
                     1,
@@ -56,7 +56,7 @@ def test_an_additional_valid_property_is_valid_passes(self):
                 "quux":
                     True,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_are_allowed_by_default.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_are_allowed_by_default.py
index e6e905b4de6..bb6fe942bb6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_are_allowed_by_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_are_allowed_by_default.py
@@ -18,11 +18,11 @@
 
 class TestAdditionalpropertiesAreAllowedByDefault(unittest.TestCase):
     """AdditionalpropertiesAreAllowedByDefault unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_additional_properties_are_allowed_passes(self):
         # additional properties are allowed
-        AdditionalpropertiesAreAllowedByDefault.from_openapi_data_oapg(
+        AdditionalpropertiesAreAllowedByDefault.from_openapi_data_(
             {
                 "foo":
                     1,
@@ -31,7 +31,7 @@ def test_additional_properties_are_allowed_passes(self):
                 "quux":
                     True,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_can_exist_by_itself.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_can_exist_by_itself.py
index 1c870f17e80..493c51fa523 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_can_exist_by_itself.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_can_exist_by_itself.py
@@ -18,27 +18,27 @@
 
 class TestAdditionalpropertiesCanExistByItself(unittest.TestCase):
     """AdditionalpropertiesCanExistByItself unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_an_additional_invalid_property_is_invalid_fails(self):
         # an additional invalid property is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AdditionalpropertiesCanExistByItself.from_openapi_data_oapg(
+            AdditionalpropertiesCanExistByItself.from_openapi_data_(
                 {
                     "foo":
                         1,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_additional_valid_property_is_valid_passes(self):
         # an additional valid property is valid
-        AdditionalpropertiesCanExistByItself.from_openapi_data_oapg(
+        AdditionalpropertiesCanExistByItself.from_openapi_data_(
             {
                 "foo":
                     True,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_should_not_look_in_applicators.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_should_not_look_in_applicators.py
index 0875f1714cb..b68aee9d2f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_should_not_look_in_applicators.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_additionalproperties_should_not_look_in_applicators.py
@@ -18,31 +18,31 @@
 
 class TestAdditionalpropertiesShouldNotLookInApplicators(unittest.TestCase):
     """AdditionalpropertiesShouldNotLookInApplicators unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_properties_defined_in_allof_are_not_examined_fails(self):
         # properties defined in allOf are not examined
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_oapg(
+            AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_(
                 {
                     "foo":
                         1,
                     "bar":
                         True,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_valid_test_case_passes(self):
         # valid test case
-        AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_oapg(
+        AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_(
             {
                 "foo":
                     False,
                 "bar":
                     True,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof.py
index 68f30eeb387..60c3f3204e2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof.py
@@ -18,53 +18,53 @@
 
 class TestAllof(unittest.TestCase):
     """Allof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_allof_passes(self):
         # allOf
-        Allof.from_openapi_data_oapg(
+        Allof.from_openapi_data_(
             {
                 "foo":
                     "baz",
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_mismatch_first_fails(self):
         # mismatch first
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Allof.from_openapi_data_oapg(
+            Allof.from_openapi_data_(
                 {
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_second_fails(self):
         # mismatch second
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Allof.from_openapi_data_oapg(
+            Allof.from_openapi_data_(
                 {
                     "foo":
                         "baz",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_wrong_type_fails(self):
         # wrong type
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Allof.from_openapi_data_oapg(
+            Allof.from_openapi_data_(
                 {
                     "foo":
                         "baz",
                     "bar":
                         "quux",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_combined_with_anyof_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_combined_with_anyof_oneof.py
index 429e27c9280..eff7ec62ea2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_combined_with_anyof_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_combined_with_anyof_oneof.py
@@ -18,69 +18,69 @@
 
 class TestAllofCombinedWithAnyofOneof(unittest.TestCase):
     """AllofCombinedWithAnyofOneof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_allof_true_anyof_false_oneof_false_fails(self):
         # allOf: true, anyOf: false, oneOf: false
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 2,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_false_anyof_false_oneof_true_fails(self):
         # allOf: false, anyOf: false, oneOf: true
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 5,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_false_anyof_true_oneof_true_fails(self):
         # allOf: false, anyOf: true, oneOf: true
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 15,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_true_anyof_true_oneof_false_fails(self):
         # allOf: true, anyOf: true, oneOf: false
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 6,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_true_anyof_true_oneof_true_passes(self):
         # allOf: true, anyOf: true, oneOf: true
-        AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+        AllofCombinedWithAnyofOneof.from_openapi_data_(
             30,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_allof_true_anyof_false_oneof_true_fails(self):
         # allOf: true, anyOf: false, oneOf: true
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 10,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_false_anyof_true_oneof_false_fails(self):
         # allOf: false, anyOf: true, oneOf: false
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 3,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_allof_false_anyof_false_oneof_false_fails(self):
         # allOf: false, anyOf: false, oneOf: false
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            AllofCombinedWithAnyofOneof.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_simple_types.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_simple_types.py
index ab8c0c1d912..8756c9150d4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_simple_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_simple_types.py
@@ -18,21 +18,21 @@
 
 class TestAllofSimpleTypes(unittest.TestCase):
     """AllofSimpleTypes unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_valid_passes(self):
         # valid
-        AllofSimpleTypes.from_openapi_data_oapg(
+        AllofSimpleTypes.from_openapi_data_(
             25,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_mismatch_one_fails(self):
         # mismatch one
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofSimpleTypes.from_openapi_data_oapg(
+            AllofSimpleTypes.from_openapi_data_(
                 35,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_base_schema.py
index c7725abf7c1..c3ee4cf0525 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_base_schema.py
@@ -18,11 +18,11 @@
 
 class TestAllofWithBaseSchema(unittest.TestCase):
     """AllofWithBaseSchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_valid_passes(self):
         # valid
-        AllofWithBaseSchema.from_openapi_data_oapg(
+        AllofWithBaseSchema.from_openapi_data_(
             {
                 "foo":
                     "quux",
@@ -31,57 +31,57 @@ def test_valid_passes(self):
                 "baz":
                     None,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_mismatch_first_allof_fails(self):
         # mismatch first allOf
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithBaseSchema.from_openapi_data_oapg(
+            AllofWithBaseSchema.from_openapi_data_(
                 {
                     "bar":
                         2,
                     "baz":
                         None,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_base_schema_fails(self):
         # mismatch base schema
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithBaseSchema.from_openapi_data_oapg(
+            AllofWithBaseSchema.from_openapi_data_(
                 {
                     "foo":
                         "quux",
                     "baz":
                         None,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_both_fails(self):
         # mismatch both
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithBaseSchema.from_openapi_data_oapg(
+            AllofWithBaseSchema.from_openapi_data_(
                 {
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_second_allof_fails(self):
         # mismatch second allOf
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithBaseSchema.from_openapi_data_oapg(
+            AllofWithBaseSchema.from_openapi_data_(
                 {
                     "foo":
                         "quux",
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_one_empty_schema.py
index 2d1d469b92e..817d2865130 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_one_empty_schema.py
@@ -18,13 +18,13 @@
 
 class TestAllofWithOneEmptySchema(unittest.TestCase):
     """AllofWithOneEmptySchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_any_data_is_valid_passes(self):
         # any data is valid
-        AllofWithOneEmptySchema.from_openapi_data_oapg(
+        AllofWithOneEmptySchema.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_first_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_first_empty_schema.py
index e2bc5dbe5a4..c66ed120459 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_first_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_first_empty_schema.py
@@ -18,21 +18,21 @@
 
 class TestAllofWithTheFirstEmptySchema(unittest.TestCase):
     """AllofWithTheFirstEmptySchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_string_is_invalid_fails(self):
         # string is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithTheFirstEmptySchema.from_openapi_data_oapg(
+            AllofWithTheFirstEmptySchema.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_number_is_valid_passes(self):
         # number is valid
-        AllofWithTheFirstEmptySchema.from_openapi_data_oapg(
+        AllofWithTheFirstEmptySchema.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_last_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_last_empty_schema.py
index 96e61a0a7aa..a7a1a43a003 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_last_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_the_last_empty_schema.py
@@ -18,21 +18,21 @@
 
 class TestAllofWithTheLastEmptySchema(unittest.TestCase):
     """AllofWithTheLastEmptySchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_string_is_invalid_fails(self):
         # string is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AllofWithTheLastEmptySchema.from_openapi_data_oapg(
+            AllofWithTheLastEmptySchema.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_number_is_valid_passes(self):
         # number is valid
-        AllofWithTheLastEmptySchema.from_openapi_data_oapg(
+        AllofWithTheLastEmptySchema.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_two_empty_schemas.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_two_empty_schemas.py
index 811f193e5e2..639fb8b43ba 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_two_empty_schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_allof_with_two_empty_schemas.py
@@ -18,13 +18,13 @@
 
 class TestAllofWithTwoEmptySchemas(unittest.TestCase):
     """AllofWithTwoEmptySchemas unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_any_data_is_valid_passes(self):
         # any data is valid
-        AllofWithTwoEmptySchemas.from_openapi_data_oapg(
+        AllofWithTwoEmptySchemas.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof.py
index b4a59979b76..53dd170a2f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof.py
@@ -18,35 +18,35 @@
 
 class TestAnyof(unittest.TestCase):
     """Anyof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_second_anyof_valid_passes(self):
         # second anyOf valid
-        Anyof.from_openapi_data_oapg(
+        Anyof.from_openapi_data_(
             2.5,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_neither_anyof_valid_fails(self):
         # neither anyOf valid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Anyof.from_openapi_data_oapg(
+            Anyof.from_openapi_data_(
                 1.5,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_anyof_valid_passes(self):
         # both anyOf valid
-        Anyof.from_openapi_data_oapg(
+        Anyof.from_openapi_data_(
             3,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_first_anyof_valid_passes(self):
         # first anyOf valid
-        Anyof.from_openapi_data_oapg(
+        Anyof.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_complex_types.py
index a284d3bec8a..dce893a1580 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_complex_types.py
@@ -18,51 +18,51 @@
 
 class TestAnyofComplexTypes(unittest.TestCase):
     """AnyofComplexTypes unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_second_anyof_valid_complex_passes(self):
         # second anyOf valid (complex)
-        AnyofComplexTypes.from_openapi_data_oapg(
+        AnyofComplexTypes.from_openapi_data_(
             {
                 "foo":
                     "baz",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_neither_anyof_valid_complex_fails(self):
         # neither anyOf valid (complex)
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AnyofComplexTypes.from_openapi_data_oapg(
+            AnyofComplexTypes.from_openapi_data_(
                 {
                     "foo":
                         2,
                     "bar":
                         "quux",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_anyof_valid_complex_passes(self):
         # both anyOf valid (complex)
-        AnyofComplexTypes.from_openapi_data_oapg(
+        AnyofComplexTypes.from_openapi_data_(
             {
                 "foo":
                     "baz",
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_first_anyof_valid_complex_passes(self):
         # first anyOf valid (complex)
-        AnyofComplexTypes.from_openapi_data_oapg(
+        AnyofComplexTypes.from_openapi_data_(
             {
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_base_schema.py
index 016d6c28953..b0c3e3cc320 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_base_schema.py
@@ -18,29 +18,29 @@
 
 class TestAnyofWithBaseSchema(unittest.TestCase):
     """AnyofWithBaseSchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_one_anyof_valid_passes(self):
         # one anyOf valid
-        AnyofWithBaseSchema.from_openapi_data_oapg(
+        AnyofWithBaseSchema.from_openapi_data_(
             "foobar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_both_anyof_invalid_fails(self):
         # both anyOf invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AnyofWithBaseSchema.from_openapi_data_oapg(
+            AnyofWithBaseSchema.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_base_schema_fails(self):
         # mismatch base schema
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            AnyofWithBaseSchema.from_openapi_data_oapg(
+            AnyofWithBaseSchema.from_openapi_data_(
                 3,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_one_empty_schema.py
index 71891f8c0cd..ccc46114327 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_anyof_with_one_empty_schema.py
@@ -18,20 +18,20 @@
 
 class TestAnyofWithOneEmptySchema(unittest.TestCase):
     """AnyofWithOneEmptySchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_string_is_valid_passes(self):
         # string is valid
-        AnyofWithOneEmptySchema.from_openapi_data_oapg(
+        AnyofWithOneEmptySchema.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_number_is_valid_passes(self):
         # number is valid
-        AnyofWithOneEmptySchema.from_openapi_data_oapg(
+        AnyofWithOneEmptySchema.from_openapi_data_(
             123,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_array_type_matches_arrays.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_array_type_matches_arrays.py
index 6e8285508de..3c391c9e832 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_array_type_matches_arrays.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_array_type_matches_arrays.py
@@ -18,63 +18,63 @@
 
 class TestArrayTypeMatchesArrays(unittest.TestCase):
     """ArrayTypeMatchesArrays unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_a_float_is_not_an_array_fails(self):
         # a float is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_boolean_is_not_an_array_fails(self):
         # a boolean is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_an_array_fails(self):
         # null is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_object_is_not_an_array_fails(self):
         # an object is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_not_an_array_fails(self):
         # a string is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_array_is_an_array_passes(self):
         # an array is an array
-        ArrayTypeMatchesArrays.from_openapi_data_oapg(
+        ArrayTypeMatchesArrays.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_integer_is_not_an_array_fails(self):
         # an integer is not an array
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            ArrayTypeMatchesArrays.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_boolean_type_matches_booleans.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_boolean_type_matches_booleans.py
index 2cd38bb4663..0364b1a17bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_boolean_type_matches_booleans.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_boolean_type_matches_booleans.py
@@ -18,86 +18,86 @@
 
 class TestBooleanTypeMatchesBooleans(unittest.TestCase):
     """BooleanTypeMatchesBooleans unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_an_empty_string_is_not_a_boolean_fails(self):
         # an empty string is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 "",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_float_is_not_a_boolean_fails(self):
         # a float is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_a_boolean_fails(self):
         # null is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_zero_is_not_a_boolean_fails(self):
         # zero is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 0,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_array_is_not_a_boolean_fails(self):
         # an array is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_not_a_boolean_fails(self):
         # a string is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_false_is_a_boolean_passes(self):
         # false is a boolean
-        BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+        BooleanTypeMatchesBooleans.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_integer_is_not_a_boolean_fails(self):
         # an integer is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_true_is_a_boolean_passes(self):
         # true is a boolean
-        BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+        BooleanTypeMatchesBooleans.from_openapi_data_(
             True,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_object_is_not_a_boolean_fails(self):
         # an object is not a boolean
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            BooleanTypeMatchesBooleans.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_int.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_int.py
index 5984c9f73bb..b920ad4258c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_int.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_int.py
@@ -18,28 +18,28 @@
 
 class TestByInt(unittest.TestCase):
     """ByInt unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_int_by_int_fail_fails(self):
         # int by int fail
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ByInt.from_openapi_data_oapg(
+            ByInt.from_openapi_data_(
                 7,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_int_by_int_passes(self):
         # int by int
-        ByInt.from_openapi_data_oapg(
+        ByInt.from_openapi_data_(
             10,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_non_numbers_passes(self):
         # ignores non-numbers
-        ByInt.from_openapi_data_oapg(
+        ByInt.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_number.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_number.py
index bce0bfca81a..e965ff1a2d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_number.py
@@ -18,28 +18,28 @@
 
 class TestByNumber(unittest.TestCase):
     """ByNumber unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_45_is_multiple_of15_passes(self):
         # 4.5 is multiple of 1.5
-        ByNumber.from_openapi_data_oapg(
+        ByNumber.from_openapi_data_(
             4.5,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_35_is_not_multiple_of15_fails(self):
         # 35 is not multiple of 1.5
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ByNumber.from_openapi_data_oapg(
+            ByNumber.from_openapi_data_(
                 35,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_zero_is_multiple_of_anything_passes(self):
         # zero is multiple of anything
-        ByNumber.from_openapi_data_oapg(
+        ByNumber.from_openapi_data_(
             0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_small_number.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_small_number.py
index ccd23db5bf6..f6a739b7941 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_small_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_by_small_number.py
@@ -18,21 +18,21 @@
 
 class TestBySmallNumber(unittest.TestCase):
     """BySmallNumber unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_000751_is_not_multiple_of00001_fails(self):
         # 0.00751 is not multiple of 0.0001
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            BySmallNumber.from_openapi_data_oapg(
+            BySmallNumber.from_openapi_data_(
                 0.00751,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_00075_is_multiple_of00001_passes(self):
         # 0.0075 is multiple of 0.0001
-        BySmallNumber.from_openapi_data_oapg(
+        BySmallNumber.from_openapi_data_(
             0.0075,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_date_time_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_date_time_format.py
index 5939c88248f..c424545814a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_date_time_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_date_time_format.py
@@ -18,50 +18,50 @@
 
 class TestDateTimeFormat(unittest.TestCase):
     """DateTimeFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        DateTimeFormat.from_openapi_data_oapg(
+        DateTimeFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_email_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_email_format.py
index e3d00ebdde3..d5709dc3fea 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_email_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_email_format.py
@@ -18,50 +18,50 @@
 
 class TestEmailFormat(unittest.TestCase):
     """EmailFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        EmailFormat.from_openapi_data_oapg(
+        EmailFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with0_does_not_match_false.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with0_does_not_match_false.py
index 24daa4a0a26..46af1ad9c69 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with0_does_not_match_false.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with0_does_not_match_false.py
@@ -18,28 +18,28 @@
 
 class TestEnumWith0DoesNotMatchFalse(unittest.TestCase):
     """EnumWith0DoesNotMatchFalse unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_integer_zero_is_valid_passes(self):
         # integer zero is valid
-        EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+        EnumWith0DoesNotMatchFalse.from_openapi_data_(
             0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_float_zero_is_valid_passes(self):
         # float zero is valid
-        EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+        EnumWith0DoesNotMatchFalse.from_openapi_data_(
             0.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_false_is_invalid_fails(self):
         # false is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+            EnumWith0DoesNotMatchFalse.from_openapi_data_(
                 False,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with1_does_not_match_true.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with1_does_not_match_true.py
index df6a37c9471..ad9cce9c7ba 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with1_does_not_match_true.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with1_does_not_match_true.py
@@ -18,28 +18,28 @@
 
 class TestEnumWith1DoesNotMatchTrue(unittest.TestCase):
     """EnumWith1DoesNotMatchTrue unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_true_is_invalid_fails(self):
         # true is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+            EnumWith1DoesNotMatchTrue.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_integer_one_is_valid_passes(self):
         # integer one is valid
-        EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+        EnumWith1DoesNotMatchTrue.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_float_one_is_valid_passes(self):
         # float one is valid
-        EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+        EnumWith1DoesNotMatchTrue.from_openapi_data_(
             1.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_escaped_characters.py
index 91a196d61c5..03063300914 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_escaped_characters.py
@@ -18,28 +18,28 @@
 
 class TestEnumWithEscapedCharacters(unittest.TestCase):
     """EnumWithEscapedCharacters unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_member2_is_valid_passes(self):
         # member 2 is valid
-        EnumWithEscapedCharacters.from_openapi_data_oapg(
+        EnumWithEscapedCharacters.from_openapi_data_(
             "foo\rbar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_member1_is_valid_passes(self):
         # member 1 is valid
-        EnumWithEscapedCharacters.from_openapi_data_oapg(
+        EnumWithEscapedCharacters.from_openapi_data_(
             "foo\nbar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_another_string_is_invalid_fails(self):
         # another string is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWithEscapedCharacters.from_openapi_data_oapg(
+            EnumWithEscapedCharacters.from_openapi_data_(
                 "abc",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_false_does_not_match0.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_false_does_not_match0.py
index 12e329ea715..cdaf6ec1ffd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_false_does_not_match0.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_false_does_not_match0.py
@@ -18,29 +18,29 @@
 
 class TestEnumWithFalseDoesNotMatch0(unittest.TestCase):
     """EnumWithFalseDoesNotMatch0 unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_false_is_valid_passes(self):
         # false is valid
-        EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+        EnumWithFalseDoesNotMatch0.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_float_zero_is_invalid_fails(self):
         # float zero is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+            EnumWithFalseDoesNotMatch0.from_openapi_data_(
                 0.0,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_integer_zero_is_invalid_fails(self):
         # integer zero is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+            EnumWithFalseDoesNotMatch0.from_openapi_data_(
                 0,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_true_does_not_match1.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_true_does_not_match1.py
index 0b6638b7241..0f0bdbbc152 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_true_does_not_match1.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enum_with_true_does_not_match1.py
@@ -18,29 +18,29 @@
 
 class TestEnumWithTrueDoesNotMatch1(unittest.TestCase):
     """EnumWithTrueDoesNotMatch1 unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_float_one_is_invalid_fails(self):
         # float one is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+            EnumWithTrueDoesNotMatch1.from_openapi_data_(
                 1.0,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_true_is_valid_passes(self):
         # true is valid
-        EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+        EnumWithTrueDoesNotMatch1.from_openapi_data_(
             True,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_integer_one_is_invalid_fails(self):
         # integer one is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+            EnumWithTrueDoesNotMatch1.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enums_in_properties.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enums_in_properties.py
index e591e90f8aa..045d0f001be 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enums_in_properties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_enums_in_properties.py
@@ -18,74 +18,74 @@
 
 class TestEnumsInProperties(unittest.TestCase):
     """EnumsInProperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_missing_optional_property_is_valid_passes(self):
         # missing optional property is valid
-        EnumsInProperties.from_openapi_data_oapg(
+        EnumsInProperties.from_openapi_data_(
             {
                 "bar":
                     "bar",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_wrong_foo_value_fails(self):
         # wrong foo value
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumsInProperties.from_openapi_data_oapg(
+            EnumsInProperties.from_openapi_data_(
                 {
                     "foo":
                         "foot",
                     "bar":
                         "bar",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_properties_are_valid_passes(self):
         # both properties are valid
-        EnumsInProperties.from_openapi_data_oapg(
+        EnumsInProperties.from_openapi_data_(
             {
                 "foo":
                     "foo",
                 "bar":
                     "bar",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_wrong_bar_value_fails(self):
         # wrong bar value
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumsInProperties.from_openapi_data_oapg(
+            EnumsInProperties.from_openapi_data_(
                 {
                     "foo":
                         "foo",
                     "bar":
                         "bart",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_missing_all_properties_is_invalid_fails(self):
         # missing all properties is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumsInProperties.from_openapi_data_oapg(
+            EnumsInProperties.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_missing_required_property_is_invalid_fails(self):
         # missing required property is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            EnumsInProperties.from_openapi_data_oapg(
+            EnumsInProperties.from_openapi_data_(
                 {
                     "foo":
                         "foo",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_forbidden_property.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_forbidden_property.py
index d7b9f572246..9a63b89f6f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_forbidden_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_forbidden_property.py
@@ -18,31 +18,31 @@
 
 class TestForbiddenProperty(unittest.TestCase):
     """ForbiddenProperty unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_present_fails(self):
         # property present
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ForbiddenProperty.from_openapi_data_oapg(
+            ForbiddenProperty.from_openapi_data_(
                 {
                     "foo":
                         1,
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_property_absent_passes(self):
         # property absent
-        ForbiddenProperty.from_openapi_data_oapg(
+        ForbiddenProperty.from_openapi_data_(
             {
                 "bar":
                     1,
                 "baz":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_hostname_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_hostname_format.py
index d4f0096ac97..ca72a380895 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_hostname_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_hostname_format.py
@@ -18,50 +18,50 @@
 
 class TestHostnameFormat(unittest.TestCase):
     """HostnameFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        HostnameFormat.from_openapi_data_oapg(
+        HostnameFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_integer_type_matches_integers.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_integer_type_matches_integers.py
index ab8fa9376b9..da68d8c2daf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_integer_type_matches_integers.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_integer_type_matches_integers.py
@@ -18,78 +18,78 @@
 
 class TestIntegerTypeMatchesIntegers(unittest.TestCase):
     """IntegerTypeMatchesIntegers unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_an_object_is_not_an_integer_fails(self):
         # an object is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_not_an_integer_fails(self):
         # a string is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_an_integer_fails(self):
         # null is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_float_with_zero_fractional_part_is_an_integer_passes(self):
         # a float with zero fractional part is an integer
-        IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+        IntegerTypeMatchesIntegers.from_openapi_data_(
             1.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_float_is_not_an_integer_fails(self):
         # a float is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_boolean_is_not_an_integer_fails(self):
         # a boolean is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_integer_is_an_integer_passes(self):
         # an integer is an integer
-        IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+        IntegerTypeMatchesIntegers.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_string_is_still_not_an_integer_even_if_it_looks_like_one_fails(self):
         # a string is still not an integer, even if it looks like one
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 "1",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_array_is_not_an_integer_fails(self):
         # an array is not an integer
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            IntegerTypeMatchesIntegers.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_instance_should_not_raise_error_when_float_division_inf.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_instance_should_not_raise_error_when_float_division_inf.py
index 723c7b01296..55351c93f20 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_instance_should_not_raise_error_when_float_division_inf.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_instance_should_not_raise_error_when_float_division_inf.py
@@ -18,21 +18,21 @@
 
 class TestInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf(unittest.TestCase):
     """InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_always_invalid_but_naive_implementations_may_raise_an_overflow_error_fails(self):
         # always invalid, but naive implementations may raise an overflow error
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_oapg(
+            InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_(
                 1.0E308,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_valid_integer_with_multipleof_float_passes(self):
         # valid integer with multipleOf float
-        InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_oapg(
+        InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_(
             123456789,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_string_value_for_default.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_string_value_for_default.py
index d3f0d7e1994..70322629b9c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_string_value_for_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_invalid_string_value_for_default.py
@@ -18,24 +18,24 @@
 
 class TestInvalidStringValueForDefault(unittest.TestCase):
     """InvalidStringValueForDefault unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_valid_when_property_is_specified_passes(self):
         # valid when property is specified
-        InvalidStringValueForDefault.from_openapi_data_oapg(
+        InvalidStringValueForDefault.from_openapi_data_(
             {
                 "bar":
                     "good",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_still_valid_when_the_invalid_default_is_used_passes(self):
         # still valid when the invalid default is used
-        InvalidStringValueForDefault.from_openapi_data_oapg(
+        InvalidStringValueForDefault.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv4_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv4_format.py
index 9187ee3516d..b2366362cda 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv4_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv4_format.py
@@ -18,50 +18,50 @@
 
 class TestIpv4Format(unittest.TestCase):
     """Ipv4Format unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        Ipv4Format.from_openapi_data_oapg(
+        Ipv4Format.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv6_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv6_format.py
index c93e793d5f7..cd1423fe8cc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv6_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ipv6_format.py
@@ -18,50 +18,50 @@
 
 class TestIpv6Format(unittest.TestCase):
     """Ipv6Format unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        Ipv6Format.from_openapi_data_oapg(
+        Ipv6Format.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_json_pointer_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_json_pointer_format.py
index 516d528af2a..1d8d0c707bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_json_pointer_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_json_pointer_format.py
@@ -18,50 +18,50 @@
 
 class TestJsonPointerFormat(unittest.TestCase):
     """JsonPointerFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        JsonPointerFormat.from_openapi_data_oapg(
+        JsonPointerFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation.py
index bdf5e949d62..179a59f87c1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation.py
@@ -18,35 +18,35 @@
 
 class TestMaximumValidation(unittest.TestCase):
     """MaximumValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_below_the_maximum_is_valid_passes(self):
         # below the maximum is valid
-        MaximumValidation.from_openapi_data_oapg(
+        MaximumValidation.from_openapi_data_(
             2.6,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_boundary_point_is_valid_passes(self):
         # boundary point is valid
-        MaximumValidation.from_openapi_data_oapg(
+        MaximumValidation.from_openapi_data_(
             3.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_above_the_maximum_is_invalid_fails(self):
         # above the maximum is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MaximumValidation.from_openapi_data_oapg(
+            MaximumValidation.from_openapi_data_(
                 3.5,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_non_numbers_passes(self):
         # ignores non-numbers
-        MaximumValidation.from_openapi_data_oapg(
+        MaximumValidation.from_openapi_data_(
             "x",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation_with_unsigned_integer.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation_with_unsigned_integer.py
index 4b27673c2e0..ec39878d724 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation_with_unsigned_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maximum_validation_with_unsigned_integer.py
@@ -18,35 +18,35 @@
 
 class TestMaximumValidationWithUnsignedInteger(unittest.TestCase):
     """MaximumValidationWithUnsignedInteger unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_below_the_maximum_is_invalid_passes(self):
         # below the maximum is invalid
-        MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+        MaximumValidationWithUnsignedInteger.from_openapi_data_(
             299.97,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_above_the_maximum_is_invalid_fails(self):
         # above the maximum is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+            MaximumValidationWithUnsignedInteger.from_openapi_data_(
                 300.5,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_boundary_point_integer_is_valid_passes(self):
         # boundary point integer is valid
-        MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+        MaximumValidationWithUnsignedInteger.from_openapi_data_(
             300,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_boundary_point_float_is_valid_passes(self):
         # boundary point float is valid
-        MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+        MaximumValidationWithUnsignedInteger.from_openapi_data_(
             300.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxitems_validation.py
index 024baa0c87d..8a3e70a3702 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxitems_validation.py
@@ -18,44 +18,44 @@
 
 class TestMaxitemsValidation(unittest.TestCase):
     """MaxitemsValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_too_long_is_invalid_fails(self):
         # too long is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MaxitemsValidation.from_openapi_data_oapg(
+            MaxitemsValidation.from_openapi_data_(
                 [
                     1,
                     2,
                     3,
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_non_arrays_passes(self):
         # ignores non-arrays
-        MaxitemsValidation.from_openapi_data_oapg(
+        MaxitemsValidation.from_openapi_data_(
             "foobar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_shorter_is_valid_passes(self):
         # shorter is valid
-        MaxitemsValidation.from_openapi_data_oapg(
+        MaxitemsValidation.from_openapi_data_(
             [
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MaxitemsValidation.from_openapi_data_oapg(
+        MaxitemsValidation.from_openapi_data_(
             [
                 1,
                 2,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxlength_validation.py
index 86b22f42aea..89c669ced61 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxlength_validation.py
@@ -18,42 +18,42 @@
 
 class TestMaxlengthValidation(unittest.TestCase):
     """MaxlengthValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_too_long_is_invalid_fails(self):
         # too long is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MaxlengthValidation.from_openapi_data_oapg(
+            MaxlengthValidation.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_non_strings_passes(self):
         # ignores non-strings
-        MaxlengthValidation.from_openapi_data_oapg(
+        MaxlengthValidation.from_openapi_data_(
             100,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_shorter_is_valid_passes(self):
         # shorter is valid
-        MaxlengthValidation.from_openapi_data_oapg(
+        MaxlengthValidation.from_openapi_data_(
             "f",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_two_supplementary_unicode_code_points_is_long_enough_passes(self):
         # two supplementary Unicode code points is long enough
-        MaxlengthValidation.from_openapi_data_oapg(
+        MaxlengthValidation.from_openapi_data_(
             "💩💩",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MaxlengthValidation.from_openapi_data_oapg(
+        MaxlengthValidation.from_openapi_data_(
             "fo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties0_means_the_object_is_empty.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties0_means_the_object_is_empty.py
index c97b47a00a1..31124e9b4ab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties0_means_the_object_is_empty.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties0_means_the_object_is_empty.py
@@ -18,25 +18,25 @@
 
 class TestMaxproperties0MeansTheObjectIsEmpty(unittest.TestCase):
     """Maxproperties0MeansTheObjectIsEmpty unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_no_properties_is_valid_passes(self):
         # no properties is valid
-        Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_oapg(
+        Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_one_property_is_invalid_fails(self):
         # one property is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_oapg(
+            Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_(
                 {
                     "foo":
                         1,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties_validation.py
index 8436aa706f5..72446d765dd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_maxproperties_validation.py
@@ -18,12 +18,12 @@
 
 class TestMaxpropertiesValidation(unittest.TestCase):
     """MaxpropertiesValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_too_long_is_invalid_fails(self):
         # too long is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MaxpropertiesValidation.from_openapi_data_oapg(
+            MaxpropertiesValidation.from_openapi_data_(
                 {
                     "foo":
                         1,
@@ -32,54 +32,54 @@ def test_too_long_is_invalid_fails(self):
                     "baz":
                         3,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_arrays_passes(self):
         # ignores arrays
-        MaxpropertiesValidation.from_openapi_data_oapg(
+        MaxpropertiesValidation.from_openapi_data_(
             [
                 1,
                 2,
                 3,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_other_non_objects_passes(self):
         # ignores other non-objects
-        MaxpropertiesValidation.from_openapi_data_oapg(
+        MaxpropertiesValidation.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_strings_passes(self):
         # ignores strings
-        MaxpropertiesValidation.from_openapi_data_oapg(
+        MaxpropertiesValidation.from_openapi_data_(
             "foobar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_shorter_is_valid_passes(self):
         # shorter is valid
-        MaxpropertiesValidation.from_openapi_data_oapg(
+        MaxpropertiesValidation.from_openapi_data_(
             {
                 "foo":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MaxpropertiesValidation.from_openapi_data_oapg(
+        MaxpropertiesValidation.from_openapi_data_(
             {
                 "foo":
                     1,
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation.py
index 0e645a1da5b..b79b24f9ec7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation.py
@@ -18,35 +18,35 @@
 
 class TestMinimumValidation(unittest.TestCase):
     """MinimumValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_boundary_point_is_valid_passes(self):
         # boundary point is valid
-        MinimumValidation.from_openapi_data_oapg(
+        MinimumValidation.from_openapi_data_(
             1.1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_below_the_minimum_is_invalid_fails(self):
         # below the minimum is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinimumValidation.from_openapi_data_oapg(
+            MinimumValidation.from_openapi_data_(
                 0.6,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_above_the_minimum_is_valid_passes(self):
         # above the minimum is valid
-        MinimumValidation.from_openapi_data_oapg(
+        MinimumValidation.from_openapi_data_(
             2.6,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_non_numbers_passes(self):
         # ignores non-numbers
-        MinimumValidation.from_openapi_data_oapg(
+        MinimumValidation.from_openapi_data_(
             "x",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation_with_signed_integer.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation_with_signed_integer.py
index 92d1d8e031f..7dab236e216 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation_with_signed_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minimum_validation_with_signed_integer.py
@@ -18,57 +18,57 @@
 
 class TestMinimumValidationWithSignedInteger(unittest.TestCase):
     """MinimumValidationWithSignedInteger unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_boundary_point_is_valid_passes(self):
         # boundary point is valid
-        MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+        MinimumValidationWithSignedInteger.from_openapi_data_(
             -2,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_positive_above_the_minimum_is_valid_passes(self):
         # positive above the minimum is valid
-        MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+        MinimumValidationWithSignedInteger.from_openapi_data_(
             0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_int_below_the_minimum_is_invalid_fails(self):
         # int below the minimum is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            MinimumValidationWithSignedInteger.from_openapi_data_(
                 -3,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_float_below_the_minimum_is_invalid_fails(self):
         # float below the minimum is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            MinimumValidationWithSignedInteger.from_openapi_data_(
                 -2.0001,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_boundary_point_with_float_is_valid_passes(self):
         # boundary point with float is valid
-        MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+        MinimumValidationWithSignedInteger.from_openapi_data_(
             -2.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_negative_above_the_minimum_is_valid_passes(self):
         # negative above the minimum is valid
-        MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+        MinimumValidationWithSignedInteger.from_openapi_data_(
             -1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_non_numbers_passes(self):
         # ignores non-numbers
-        MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+        MinimumValidationWithSignedInteger.from_openapi_data_(
             "x",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minitems_validation.py
index 482fb90ef32..b5601116858 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minitems_validation.py
@@ -18,41 +18,41 @@
 
 class TestMinitemsValidation(unittest.TestCase):
     """MinitemsValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_too_short_is_invalid_fails(self):
         # too short is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinitemsValidation.from_openapi_data_oapg(
+            MinitemsValidation.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_non_arrays_passes(self):
         # ignores non-arrays
-        MinitemsValidation.from_openapi_data_oapg(
+        MinitemsValidation.from_openapi_data_(
             "",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_longer_is_valid_passes(self):
         # longer is valid
-        MinitemsValidation.from_openapi_data_oapg(
+        MinitemsValidation.from_openapi_data_(
             [
                 1,
                 2,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MinitemsValidation.from_openapi_data_oapg(
+        MinitemsValidation.from_openapi_data_(
             [
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minlength_validation.py
index 73815a6a6b9..8687f7ce64a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minlength_validation.py
@@ -18,43 +18,43 @@
 
 class TestMinlengthValidation(unittest.TestCase):
     """MinlengthValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_too_short_is_invalid_fails(self):
         # too short is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinlengthValidation.from_openapi_data_oapg(
+            MinlengthValidation.from_openapi_data_(
                 "f",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_one_supplementary_unicode_code_point_is_not_long_enough_fails(self):
         # one supplementary Unicode code point is not long enough
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinlengthValidation.from_openapi_data_oapg(
+            MinlengthValidation.from_openapi_data_(
                 "💩",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_longer_is_valid_passes(self):
         # longer is valid
-        MinlengthValidation.from_openapi_data_oapg(
+        MinlengthValidation.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_non_strings_passes(self):
         # ignores non-strings
-        MinlengthValidation.from_openapi_data_oapg(
+        MinlengthValidation.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MinlengthValidation.from_openapi_data_oapg(
+        MinlengthValidation.from_openapi_data_(
             "fo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minproperties_validation.py
index 882694da382..52239470bf2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_minproperties_validation.py
@@ -18,59 +18,59 @@
 
 class TestMinpropertiesValidation(unittest.TestCase):
     """MinpropertiesValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_ignores_arrays_passes(self):
         # ignores arrays
-        MinpropertiesValidation.from_openapi_data_oapg(
+        MinpropertiesValidation.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_other_non_objects_passes(self):
         # ignores other non-objects
-        MinpropertiesValidation.from_openapi_data_oapg(
+        MinpropertiesValidation.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_too_short_is_invalid_fails(self):
         # too short is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            MinpropertiesValidation.from_openapi_data_oapg(
+            MinpropertiesValidation.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_strings_passes(self):
         # ignores strings
-        MinpropertiesValidation.from_openapi_data_oapg(
+        MinpropertiesValidation.from_openapi_data_(
             "",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_longer_is_valid_passes(self):
         # longer is valid
-        MinpropertiesValidation.from_openapi_data_oapg(
+        MinpropertiesValidation.from_openapi_data_(
             {
                 "foo":
                     1,
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_exact_length_is_valid_passes(self):
         # exact length is valid
-        MinpropertiesValidation.from_openapi_data_oapg(
+        MinpropertiesValidation.from_openapi_data_(
             {
                 "foo":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_allof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_allof_to_check_validation_semantics.py
index 958c42391ce..8283935a68d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_allof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_allof_to_check_validation_semantics.py
@@ -18,21 +18,21 @@
 
 class TestNestedAllofToCheckValidationSemantics(unittest.TestCase):
     """NestedAllofToCheckValidationSemantics unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_anything_non_null_is_invalid_fails(self):
         # anything non-null is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NestedAllofToCheckValidationSemantics.from_openapi_data_oapg(
+            NestedAllofToCheckValidationSemantics.from_openapi_data_(
                 123,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_valid_passes(self):
         # null is valid
-        NestedAllofToCheckValidationSemantics.from_openapi_data_oapg(
+        NestedAllofToCheckValidationSemantics.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_anyof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_anyof_to_check_validation_semantics.py
index de345dbd3ff..ae98824c2cf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_anyof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_anyof_to_check_validation_semantics.py
@@ -18,21 +18,21 @@
 
 class TestNestedAnyofToCheckValidationSemantics(unittest.TestCase):
     """NestedAnyofToCheckValidationSemantics unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_anything_non_null_is_invalid_fails(self):
         # anything non-null is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NestedAnyofToCheckValidationSemantics.from_openapi_data_oapg(
+            NestedAnyofToCheckValidationSemantics.from_openapi_data_(
                 123,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_valid_passes(self):
         # null is valid
-        NestedAnyofToCheckValidationSemantics.from_openapi_data_oapg(
+        NestedAnyofToCheckValidationSemantics.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_items.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_items.py
index 3227e6b3d73..60370d0d2d8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_items.py
@@ -18,11 +18,11 @@
 
 class TestNestedItems(unittest.TestCase):
     """NestedItems unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_valid_nested_array_passes(self):
         # valid nested array
-        NestedItems.from_openapi_data_oapg(
+        NestedItems.from_openapi_data_(
             [
                 [
                     [
@@ -53,13 +53,13 @@ def test_valid_nested_array_passes(self):
                     ],
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_nested_array_with_invalid_type_fails(self):
         # nested array with invalid type
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NestedItems.from_openapi_data_oapg(
+            NestedItems.from_openapi_data_(
                 [
                     [
                         [
@@ -90,13 +90,13 @@ def test_nested_array_with_invalid_type_fails(self):
                         ],
                     ],
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_not_deep_enough_fails(self):
         # not deep enough
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NestedItems.from_openapi_data_oapg(
+            NestedItems.from_openapi_data_(
                 [
                     [
                         [
@@ -121,7 +121,7 @@ def test_not_deep_enough_fails(self):
                         ],
                     ],
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_oneof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_oneof_to_check_validation_semantics.py
index f1370bc914e..cb11517da8c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_oneof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nested_oneof_to_check_validation_semantics.py
@@ -18,21 +18,21 @@
 
 class TestNestedOneofToCheckValidationSemantics(unittest.TestCase):
     """NestedOneofToCheckValidationSemantics unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_anything_non_null_is_invalid_fails(self):
         # anything non-null is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NestedOneofToCheckValidationSemantics.from_openapi_data_oapg(
+            NestedOneofToCheckValidationSemantics.from_openapi_data_(
                 123,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_valid_passes(self):
         # null is valid
-        NestedOneofToCheckValidationSemantics.from_openapi_data_oapg(
+        NestedOneofToCheckValidationSemantics.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_not_more_complex_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_not_more_complex_schema.py
index 285392fb563..24f4675bbd8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_not_more_complex_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_not_more_complex_schema.py
@@ -18,34 +18,34 @@
 
 class TestNotMoreComplexSchema(unittest.TestCase):
     """NotMoreComplexSchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_other_match_passes(self):
         # other match
-        NotMoreComplexSchema.from_openapi_data_oapg(
+        NotMoreComplexSchema.from_openapi_data_(
             {
                 "foo":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_mismatch_fails(self):
         # mismatch
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NotMoreComplexSchema.from_openapi_data_oapg(
+            NotMoreComplexSchema.from_openapi_data_(
                 {
                     "foo":
                         "bar",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_match_passes(self):
         # match
-        NotMoreComplexSchema.from_openapi_data_oapg(
+        NotMoreComplexSchema.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nul_characters_in_strings.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nul_characters_in_strings.py
index 9084a80b9e1..3a9ef33e33d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nul_characters_in_strings.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_nul_characters_in_strings.py
@@ -18,21 +18,21 @@
 
 class TestNulCharactersInStrings(unittest.TestCase):
     """NulCharactersInStrings unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_match_string_with_nul_passes(self):
         # match string with nul
-        NulCharactersInStrings.from_openapi_data_oapg(
+        NulCharactersInStrings.from_openapi_data_(
             "hello\x00there",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_do_not_match_string_lacking_nul_fails(self):
         # do not match string lacking nul
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NulCharactersInStrings.from_openapi_data_oapg(
+            NulCharactersInStrings.from_openapi_data_(
                 "hellothere",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_null_type_matches_only_the_null_object.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_null_type_matches_only_the_null_object.py
index 2279b16f3fe..a21f36d7670 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_null_type_matches_only_the_null_object.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_null_type_matches_only_the_null_object.py
@@ -18,87 +18,87 @@
 
 class TestNullTypeMatchesOnlyTheNullObject(unittest.TestCase):
     """NullTypeMatchesOnlyTheNullObject unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_a_float_is_not_null_fails(self):
         # a float is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_object_is_not_null_fails(self):
         # an object is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_false_is_not_null_fails(self):
         # false is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 False,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_integer_is_not_null_fails(self):
         # an integer is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_true_is_not_null_fails(self):
         # true is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_zero_is_not_null_fails(self):
         # zero is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 0,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_empty_string_is_not_null_fails(self):
         # an empty string is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 "",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_null_passes(self):
         # null is null
-        NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+        NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_array_is_not_null_fails(self):
         # an array is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_not_null_fails(self):
         # a string is not null
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_number_type_matches_numbers.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_number_type_matches_numbers.py
index e696122fe9f..8b27fd2c1f2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_number_type_matches_numbers.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_number_type_matches_numbers.py
@@ -18,77 +18,77 @@
 
 class TestNumberTypeMatchesNumbers(unittest.TestCase):
     """NumberTypeMatchesNumbers unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_an_array_is_not_a_number_fails(self):
         # an array is not a number
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_a_number_fails(self):
         # null is not a number
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_object_is_not_a_number_fails(self):
         # an object is not a number
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_boolean_is_not_a_number_fails(self):
         # a boolean is not a number
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_float_is_a_number_passes(self):
         # a float is a number
-        NumberTypeMatchesNumbers.from_openapi_data_oapg(
+        NumberTypeMatchesNumbers.from_openapi_data_(
             1.1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_string_is_still_not_a_number_even_if_it_looks_like_one_fails(self):
         # a string is still not a number, even if it looks like one
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 "1",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_not_a_number_fails(self):
         # a string is not a number
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            NumberTypeMatchesNumbers.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_integer_is_a_number_passes(self):
         # an integer is a number
-        NumberTypeMatchesNumbers.from_openapi_data_oapg(
+        NumberTypeMatchesNumbers.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_float_with_zero_fractional_part_is_a_number_and_an_integer_passes(self):
         # a float with zero fractional part is a number (and an integer)
-        NumberTypeMatchesNumbers.from_openapi_data_oapg(
+        NumberTypeMatchesNumbers.from_openapi_data_(
             1.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_properties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_properties_validation.py
index f8ed78ba34b..4ad925f01d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_properties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_properties_validation.py
@@ -18,27 +18,27 @@
 
 class TestObjectPropertiesValidation(unittest.TestCase):
     """ObjectPropertiesValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_ignores_arrays_passes(self):
         # ignores arrays
-        ObjectPropertiesValidation.from_openapi_data_oapg(
+        ObjectPropertiesValidation.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_other_non_objects_passes(self):
         # ignores other non-objects
-        ObjectPropertiesValidation.from_openapi_data_oapg(
+        ObjectPropertiesValidation.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_one_property_invalid_is_invalid_fails(self):
         # one property invalid is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectPropertiesValidation.from_openapi_data_oapg(
+            ObjectPropertiesValidation.from_openapi_data_(
                 {
                     "foo":
                         1,
@@ -46,36 +46,36 @@ def test_one_property_invalid_is_invalid_fails(self):
                         {
                         },
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_properties_present_and_valid_is_valid_passes(self):
         # both properties present and valid is valid
-        ObjectPropertiesValidation.from_openapi_data_oapg(
+        ObjectPropertiesValidation.from_openapi_data_(
             {
                 "foo":
                     1,
                 "bar":
                     "baz",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_doesn_t_invalidate_other_properties_passes(self):
         # doesn&#x27;t invalidate other properties
-        ObjectPropertiesValidation.from_openapi_data_oapg(
+        ObjectPropertiesValidation.from_openapi_data_(
             {
                 "quux":
                     [
                     ],
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_both_properties_invalid_is_invalid_fails(self):
         # both properties invalid is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectPropertiesValidation.from_openapi_data_oapg(
+            ObjectPropertiesValidation.from_openapi_data_(
                 {
                     "foo":
                         [
@@ -84,7 +84,7 @@ def test_both_properties_invalid_is_invalid_fails(self):
                         {
                         },
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_type_matches_objects.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_type_matches_objects.py
index 7d9b6c4f97f..d0dd09f1577 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_type_matches_objects.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_object_type_matches_objects.py
@@ -18,63 +18,63 @@
 
 class TestObjectTypeMatchesObjects(unittest.TestCase):
     """ObjectTypeMatchesObjects unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_a_float_is_not_an_object_fails(self):
         # a float is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_an_object_fails(self):
         # null is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_array_is_not_an_object_fails(self):
         # an array is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_object_is_an_object_passes(self):
         # an object is an object
-        ObjectTypeMatchesObjects.from_openapi_data_oapg(
+        ObjectTypeMatchesObjects.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_string_is_not_an_object_fails(self):
         # a string is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_integer_is_not_an_object_fails(self):
         # an integer is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_boolean_is_not_an_object_fails(self):
         # a boolean is not an object
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            ObjectTypeMatchesObjects.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof.py
index 5ae3f55557f..33f8dd9171a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof.py
@@ -18,36 +18,36 @@
 
 class TestOneof(unittest.TestCase):
     """Oneof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_second_oneof_valid_passes(self):
         # second oneOf valid
-        Oneof.from_openapi_data_oapg(
+        Oneof.from_openapi_data_(
             2.5,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_both_oneof_valid_fails(self):
         # both oneOf valid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Oneof.from_openapi_data_oapg(
+            Oneof.from_openapi_data_(
                 3,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_first_oneof_valid_passes(self):
         # first oneOf valid
-        Oneof.from_openapi_data_oapg(
+        Oneof.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_neither_oneof_valid_fails(self):
         # neither oneOf valid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            Oneof.from_openapi_data_oapg(
+            Oneof.from_openapi_data_(
                 1.5,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_complex_types.py
index 575d66b660d..8365b2cd352 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_complex_types.py
@@ -18,52 +18,52 @@
 
 class TestOneofComplexTypes(unittest.TestCase):
     """OneofComplexTypes unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_first_oneof_valid_complex_passes(self):
         # first oneOf valid (complex)
-        OneofComplexTypes.from_openapi_data_oapg(
+        OneofComplexTypes.from_openapi_data_(
             {
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_neither_oneof_valid_complex_fails(self):
         # neither oneOf valid (complex)
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofComplexTypes.from_openapi_data_oapg(
+            OneofComplexTypes.from_openapi_data_(
                 {
                     "foo":
                         2,
                     "bar":
                         "quux",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_oneof_valid_complex_fails(self):
         # both oneOf valid (complex)
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofComplexTypes.from_openapi_data_oapg(
+            OneofComplexTypes.from_openapi_data_(
                 {
                     "foo":
                         "baz",
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_second_oneof_valid_complex_passes(self):
         # second oneOf valid (complex)
-        OneofComplexTypes.from_openapi_data_oapg(
+        OneofComplexTypes.from_openapi_data_(
             {
                 "foo":
                     "baz",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_base_schema.py
index a4befc2763f..d3d11f0f800 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_base_schema.py
@@ -18,29 +18,29 @@
 
 class TestOneofWithBaseSchema(unittest.TestCase):
     """OneofWithBaseSchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_both_oneof_valid_fails(self):
         # both oneOf valid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofWithBaseSchema.from_openapi_data_oapg(
+            OneofWithBaseSchema.from_openapi_data_(
                 "foo",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_mismatch_base_schema_fails(self):
         # mismatch base schema
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofWithBaseSchema.from_openapi_data_oapg(
+            OneofWithBaseSchema.from_openapi_data_(
                 3,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_one_oneof_valid_passes(self):
         # one oneOf valid
-        OneofWithBaseSchema.from_openapi_data_oapg(
+        OneofWithBaseSchema.from_openapi_data_(
             "foobar",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_empty_schema.py
index 5b404f9bbce..b241944a687 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_empty_schema.py
@@ -18,21 +18,21 @@
 
 class TestOneofWithEmptySchema(unittest.TestCase):
     """OneofWithEmptySchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_both_valid_invalid_fails(self):
         # both valid - invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofWithEmptySchema.from_openapi_data_oapg(
+            OneofWithEmptySchema.from_openapi_data_(
                 123,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_one_valid_valid_passes(self):
         # one valid - valid
-        OneofWithEmptySchema.from_openapi_data_oapg(
+        OneofWithEmptySchema.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_required.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_required.py
index e5930eb841b..6057a6f51d4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_required.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_oneof_with_required.py
@@ -18,12 +18,12 @@
 
 class TestOneofWithRequired(unittest.TestCase):
     """OneofWithRequired unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_both_valid_invalid_fails(self):
         # both valid - invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofWithRequired.from_openapi_data_oapg(
+            OneofWithRequired.from_openapi_data_(
                 {
                     "foo":
                         1,
@@ -32,42 +32,42 @@ def test_both_valid_invalid_fails(self):
                     "baz":
                         3,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_both_invalid_invalid_fails(self):
         # both invalid - invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            OneofWithRequired.from_openapi_data_oapg(
+            OneofWithRequired.from_openapi_data_(
                 {
                     "bar":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_first_valid_valid_passes(self):
         # first valid - valid
-        OneofWithRequired.from_openapi_data_oapg(
+        OneofWithRequired.from_openapi_data_(
             {
                 "foo":
                     1,
                 "bar":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_second_valid_valid_passes(self):
         # second valid - valid
-        OneofWithRequired.from_openapi_data_oapg(
+        OneofWithRequired.from_openapi_data_(
             {
                 "foo":
                     1,
                 "baz":
                     3,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_is_not_anchored.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_is_not_anchored.py
index 0825aff0a85..9684f9fe0e9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_is_not_anchored.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_is_not_anchored.py
@@ -18,13 +18,13 @@
 
 class TestPatternIsNotAnchored(unittest.TestCase):
     """PatternIsNotAnchored unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_matches_a_substring_passes(self):
         # matches a substring
-        PatternIsNotAnchored.from_openapi_data_oapg(
+        PatternIsNotAnchored.from_openapi_data_(
             "xxaayy",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_validation.py
index 15cadec6749..7ec68b6b25b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_pattern_validation.py
@@ -18,65 +18,65 @@
 
 class TestPatternValidation(unittest.TestCase):
     """PatternValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_ignores_arrays_passes(self):
         # ignores arrays
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_objects_passes(self):
         # ignores objects
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_null_passes(self):
         # ignores null
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_floats_passes(self):
         # ignores floats
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             1.0,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_non_matching_pattern_is_invalid_fails(self):
         # a non-matching pattern is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            PatternValidation.from_openapi_data_oapg(
+            PatternValidation.from_openapi_data_(
                 "abc",
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_ignores_booleans_passes(self):
         # ignores booleans
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             True,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_matching_pattern_is_valid_passes(self):
         # a matching pattern is valid
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             "aaa",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_integers_passes(self):
         # ignores integers
-        PatternValidation.from_openapi_data_oapg(
+        PatternValidation.from_openapi_data_(
             123,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_properties_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_properties_with_escaped_characters.py
index 5b15e2ae485..0b68a5e22e9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_properties_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_properties_with_escaped_characters.py
@@ -18,11 +18,11 @@
 
 class TestPropertiesWithEscapedCharacters(unittest.TestCase):
     """PropertiesWithEscapedCharacters unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_object_with_all_numbers_is_valid_passes(self):
         # object with all numbers is valid
-        PropertiesWithEscapedCharacters.from_openapi_data_oapg(
+        PropertiesWithEscapedCharacters.from_openapi_data_(
             {
                 "foo\nbar":
                     1,
@@ -37,13 +37,13 @@ def test_object_with_all_numbers_is_valid_passes(self):
                 "foo\fbar":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_object_with_strings_is_invalid_fails(self):
         # object with strings is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            PropertiesWithEscapedCharacters.from_openapi_data_oapg(
+            PropertiesWithEscapedCharacters.from_openapi_data_(
                 {
                     "foo\nbar":
                         "1",
@@ -58,7 +58,7 @@ def test_object_with_strings_is_invalid_fails(self):
                     "foo\fbar":
                         "1",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_property_named_ref_that_is_not_a_reference.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_property_named_ref_that_is_not_a_reference.py
index aca0bcaf125..3f719e45ac7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_property_named_ref_that_is_not_a_reference.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_property_named_ref_that_is_not_a_reference.py
@@ -18,27 +18,27 @@
 
 class TestPropertyNamedRefThatIsNotAReference(unittest.TestCase):
     """PropertyNamedRefThatIsNotAReference unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        PropertyNamedRefThatIsNotAReference.from_openapi_data_oapg(
+        PropertyNamedRefThatIsNotAReference.from_openapi_data_(
             {
                 "$ref":
                     "a",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            PropertyNamedRefThatIsNotAReference.from_openapi_data_oapg(
+            PropertyNamedRefThatIsNotAReference.from_openapi_data_(
                 {
                     "$ref":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_additionalproperties.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_additionalproperties.py
index e0b0684c954..b96bbd7eedd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_additionalproperties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_additionalproperties.py
@@ -18,11 +18,11 @@
 
 class TestRefInAdditionalproperties(unittest.TestCase):
     """RefInAdditionalproperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInAdditionalproperties.from_openapi_data_oapg(
+        RefInAdditionalproperties.from_openapi_data_(
             {
                 "someProp":
                     {
@@ -30,13 +30,13 @@ def test_property_named_ref_valid_passes(self):
                             "a",
                     },
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInAdditionalproperties.from_openapi_data_oapg(
+            RefInAdditionalproperties.from_openapi_data_(
                 {
                     "someProp":
                         {
@@ -44,7 +44,7 @@ def test_property_named_ref_invalid_fails(self):
                                 2,
                         },
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_allof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_allof.py
index 5e773ecb9d1..eb5bc9b6628 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_allof.py
@@ -18,27 +18,27 @@
 
 class TestRefInAllof(unittest.TestCase):
     """RefInAllof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInAllof.from_openapi_data_oapg(
+        RefInAllof.from_openapi_data_(
             {
                 "$ref":
                     "a",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInAllof.from_openapi_data_oapg(
+            RefInAllof.from_openapi_data_(
                 {
                     "$ref":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_anyof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_anyof.py
index 79440cc47e6..d72a5656077 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_anyof.py
@@ -18,27 +18,27 @@
 
 class TestRefInAnyof(unittest.TestCase):
     """RefInAnyof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInAnyof.from_openapi_data_oapg(
+        RefInAnyof.from_openapi_data_(
             {
                 "$ref":
                     "a",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInAnyof.from_openapi_data_oapg(
+            RefInAnyof.from_openapi_data_(
                 {
                     "$ref":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_items.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_items.py
index a9cf7738200..1500f1f696d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_items.py
@@ -18,31 +18,31 @@
 
 class TestRefInItems(unittest.TestCase):
     """RefInItems unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInItems.from_openapi_data_oapg(
+        RefInItems.from_openapi_data_(
             [
                 {
                     "$ref":
                         "a",
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInItems.from_openapi_data_oapg(
+            RefInItems.from_openapi_data_(
                 [
                     {
                         "$ref":
                             2,
                     },
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_not.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_not.py
index d1b8fe5c22a..eee7689ad3b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_not.py
@@ -18,27 +18,27 @@
 
 class TestRefInNot(unittest.TestCase):
     """RefInNot unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInNot.from_openapi_data_oapg(
+        RefInNot.from_openapi_data_(
             {
                 "$ref":
                     2,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInNot.from_openapi_data_oapg(
+            RefInNot.from_openapi_data_(
                 {
                     "$ref":
                         "a",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_oneof.py
index 4838fb7ff72..f6726c5fb80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_oneof.py
@@ -18,27 +18,27 @@
 
 class TestRefInOneof(unittest.TestCase):
     """RefInOneof unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInOneof.from_openapi_data_oapg(
+        RefInOneof.from_openapi_data_(
             {
                 "$ref":
                     "a",
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInOneof.from_openapi_data_oapg(
+            RefInOneof.from_openapi_data_(
                 {
                     "$ref":
                         2,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_property.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_property.py
index 866b9485c1d..3798151ca4b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_ref_in_property.py
@@ -18,11 +18,11 @@
 
 class TestRefInProperty(unittest.TestCase):
     """RefInProperty unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_named_ref_valid_passes(self):
         # property named $ref valid
-        RefInProperty.from_openapi_data_oapg(
+        RefInProperty.from_openapi_data_(
             {
                 "a":
                     {
@@ -30,13 +30,13 @@ def test_property_named_ref_valid_passes(self):
                             "a",
                     },
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_property_named_ref_invalid_fails(self):
         # property named $ref invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RefInProperty.from_openapi_data_oapg(
+            RefInProperty.from_openapi_data_(
                 {
                     "a":
                         {
@@ -44,7 +44,7 @@ def test_property_named_ref_invalid_fails(self):
                                 2,
                         },
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_default_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_default_validation.py
index 8882537451c..acceaccc7fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_default_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_default_validation.py
@@ -18,14 +18,14 @@
 
 class TestRequiredDefaultValidation(unittest.TestCase):
     """RequiredDefaultValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_not_required_by_default_passes(self):
         # not required by default
-        RequiredDefaultValidation.from_openapi_data_oapg(
+        RequiredDefaultValidation.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_validation.py
index 3550424427a..6b1739691f0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_validation.py
@@ -18,49 +18,49 @@
 
 class TestRequiredValidation(unittest.TestCase):
     """RequiredValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_ignores_arrays_passes(self):
         # ignores arrays
-        RequiredValidation.from_openapi_data_oapg(
+        RequiredValidation.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_present_required_property_is_valid_passes(self):
         # present required property is valid
-        RequiredValidation.from_openapi_data_oapg(
+        RequiredValidation.from_openapi_data_(
             {
                 "foo":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_other_non_objects_passes(self):
         # ignores other non-objects
-        RequiredValidation.from_openapi_data_oapg(
+        RequiredValidation.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_ignores_strings_passes(self):
         # ignores strings
-        RequiredValidation.from_openapi_data_oapg(
+        RequiredValidation.from_openapi_data_(
             "",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_present_required_property_is_invalid_fails(self):
         # non-present required property is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RequiredValidation.from_openapi_data_oapg(
+            RequiredValidation.from_openapi_data_(
                 {
                     "bar":
                         1,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_empty_array.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_empty_array.py
index 162baf3a9eb..25408c0f5b6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_empty_array.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_empty_array.py
@@ -18,14 +18,14 @@
 
 class TestRequiredWithEmptyArray(unittest.TestCase):
     """RequiredWithEmptyArray unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_property_not_required_passes(self):
         # property not required
-        RequiredWithEmptyArray.from_openapi_data_oapg(
+        RequiredWithEmptyArray.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_escaped_characters.py
index cc730dd11cc..b6018931ccc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_required_with_escaped_characters.py
@@ -18,24 +18,24 @@
 
 class TestRequiredWithEscapedCharacters(unittest.TestCase):
     """RequiredWithEscapedCharacters unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_object_with_some_properties_missing_is_invalid_fails(self):
         # object with some properties missing is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            RequiredWithEscapedCharacters.from_openapi_data_oapg(
+            RequiredWithEscapedCharacters.from_openapi_data_(
                 {
                     "foo\nbar":
                         "1",
                     "foo\"bar":
                         "1",
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_object_with_all_properties_present_is_valid_passes(self):
         # object with all properties present is valid
-        RequiredWithEscapedCharacters.from_openapi_data_oapg(
+        RequiredWithEscapedCharacters.from_openapi_data_(
             {
                 "foo\nbar":
                     1,
@@ -50,7 +50,7 @@ def test_object_with_all_properties_present_is_valid_passes(self):
                 "foo\fbar":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_simple_enum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_simple_enum_validation.py
index e3fd5d1cc41..c07f94e9bc8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_simple_enum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_simple_enum_validation.py
@@ -18,21 +18,21 @@
 
 class TestSimpleEnumValidation(unittest.TestCase):
     """SimpleEnumValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_something_else_is_invalid_fails(self):
         # something else is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            SimpleEnumValidation.from_openapi_data_oapg(
+            SimpleEnumValidation.from_openapi_data_(
                 4,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_one_of_the_enum_is_valid_passes(self):
         # one of the enum is valid
-        SimpleEnumValidation.from_openapi_data_oapg(
+        SimpleEnumValidation.from_openapi_data_(
             1,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_string_type_matches_strings.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_string_type_matches_strings.py
index 7023715bb8d..1800ac3c01f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_string_type_matches_strings.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_string_type_matches_strings.py
@@ -18,77 +18,77 @@
 
 class TestStringTypeMatchesStrings(unittest.TestCase):
     """StringTypeMatchesStrings unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_1_is_not_a_string_fails(self):
         # 1 is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_still_a_string_even_if_it_looks_like_a_number_passes(self):
         # a string is still a string, even if it looks like a number
-        StringTypeMatchesStrings.from_openapi_data_oapg(
+        StringTypeMatchesStrings.from_openapi_data_(
             "1",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_empty_string_is_still_a_string_passes(self):
         # an empty string is still a string
-        StringTypeMatchesStrings.from_openapi_data_oapg(
+        StringTypeMatchesStrings.from_openapi_data_(
             "",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_float_is_not_a_string_fails(self):
         # a float is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 1.1,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_object_is_not_a_string_fails(self):
         # an object is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 {
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_an_array_is_not_a_string_fails(self):
         # an array is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 [
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_boolean_is_not_a_string_fails(self):
         # a boolean is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 True,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_null_is_not_a_string_fails(self):
         # null is not a string
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            StringTypeMatchesStrings.from_openapi_data_oapg(
+            StringTypeMatchesStrings.from_openapi_data_(
                 None,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_a_string_is_a_string_passes(self):
         # a string is a string
-        StringTypeMatchesStrings.from_openapi_data_oapg(
+        StringTypeMatchesStrings.from_openapi_data_(
             "foo",
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_the_default_keyword_does_not_do_anything_if_the_property_is_missing.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
index 6314a54a0c8..733010538a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
@@ -18,35 +18,35 @@
 
 class TestTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(unittest.TestCase):
     """TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_missing_properties_are_not_filled_in_with_the_default_passes(self):
         # missing properties are not filled in with the default
-        TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+        TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_explicit_property_value_is_checked_against_maximum_passing_passes(self):
         # an explicit property value is checked against maximum (passing)
-        TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+        TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
             {
                 "alpha":
                     1,
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_an_explicit_property_value_is_checked_against_maximum_failing_fails(self):
         # an explicit property value is checked against maximum (failing)
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+            TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
                 {
                     "alpha":
                         5,
                 },
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_false_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_false_validation.py
index dbc783f4c82..2b540ec10a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_false_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_false_validation.py
@@ -18,21 +18,21 @@
 
 class TestUniqueitemsFalseValidation(unittest.TestCase):
     """UniqueitemsFalseValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_non_unique_array_of_integers_is_valid_passes(self):
         # non-unique array of integers is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 1,
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_objects_is_valid_passes(self):
         # unique array of objects is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -43,12 +43,12 @@ def test_unique_array_of_objects_is_valid_passes(self):
                         "baz",
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_nested_objects_is_valid_passes(self):
         # non-unique array of nested objects is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -71,12 +71,12 @@ def test_non_unique_array_of_nested_objects_is_valid_passes(self):
                         },
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_objects_is_valid_passes(self):
         # non-unique array of objects is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -87,32 +87,32 @@ def test_non_unique_array_of_objects_is_valid_passes(self):
                         "bar",
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_1_and_true_are_unique_passes(self):
         # 1 and true are unique
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 1,
                 True,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_integers_is_valid_passes(self):
         # unique array of integers is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 1,
                 2,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_arrays_is_valid_passes(self):
         # non-unique array of arrays is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 [
                     "foo",
@@ -121,33 +121,33 @@ def test_non_unique_array_of_arrays_is_valid_passes(self):
                     "foo",
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_numbers_are_unique_if_mathematically_unequal_passes(self):
         # numbers are unique if mathematically unequal
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 1.0,
                 1.0,
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_false_is_not_equal_to_zero_passes(self):
         # false is not equal to zero
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 0,
                 False,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_nested_objects_is_valid_passes(self):
         # unique array of nested objects is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -170,22 +170,22 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
                         },
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_0_and_false_are_unique_passes(self):
         # 0 and false are unique
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 0,
                 False,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_arrays_is_valid_passes(self):
         # unique array of arrays is valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 [
                     "foo",
@@ -194,22 +194,22 @@ def test_unique_array_of_arrays_is_valid_passes(self):
                     "bar",
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_true_is_not_equal_to_one_passes(self):
         # true is not equal to one
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 1,
                 True,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_heterogeneous_types_are_valid_passes(self):
         # non-unique heterogeneous types are valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                 },
@@ -222,12 +222,12 @@ def test_non_unique_heterogeneous_types_are_valid_passes(self):
                 },
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_heterogeneous_types_are_valid_passes(self):
         # unique heterogeneous types are valid
-        UniqueitemsFalseValidation.from_openapi_data_oapg(
+        UniqueitemsFalseValidation.from_openapi_data_(
             [
                 {
                 },
@@ -238,7 +238,7 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
                 None,
                 1,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_validation.py
index 862e2af2d92..28ef4c12576 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uniqueitems_validation.py
@@ -18,11 +18,11 @@
 
 class TestUniqueitemsValidation(unittest.TestCase):
     """UniqueitemsValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_unique_array_of_objects_is_valid_passes(self):
         # unique array of objects is valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -33,12 +33,12 @@ def test_unique_array_of_objects_is_valid_passes(self):
                         "baz",
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_true_and_a1_are_unique_passes(self):
         # {&quot;a&quot;: true} and {&quot;a&quot;: 1} are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                     "a":
@@ -49,13 +49,13 @@ def test_a_true_and_a1_are_unique_passes(self):
                         1,
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_heterogeneous_types_are_invalid_fails(self):
         # non-unique heterogeneous types are invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     {
                     },
@@ -68,12 +68,12 @@ def test_non_unique_heterogeneous_types_are_invalid_fails(self):
                     },
                     1,
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_nested0_and_false_are_unique_passes(self):
         # nested [0] and [false] are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 [
                     [
@@ -88,12 +88,12 @@ def test_nested0_and_false_are_unique_passes(self):
                     "foo",
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_a_false_and_a0_are_unique_passes(self):
         # {&quot;a&quot;: false} and {&quot;a&quot;: 0} are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                     "a":
@@ -104,34 +104,34 @@ def test_a_false_and_a0_are_unique_passes(self):
                         0,
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_numbers_are_unique_if_mathematically_unequal_fails(self):
         # numbers are unique if mathematically unequal
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     1.0,
                     1.0,
                     1,
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_false_is_not_equal_to_zero_passes(self):
         # false is not equal to zero
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 0,
                 False,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_0_and_false_are_unique_passes(self):
         # [0] and [false] are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 [
                     0,
@@ -140,12 +140,12 @@ def test_0_and_false_are_unique_passes(self):
                     False,
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_arrays_is_valid_passes(self):
         # unique array of arrays is valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 [
                     "foo",
@@ -154,13 +154,13 @@ def test_unique_array_of_arrays_is_valid_passes(self):
                     "bar",
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_nested_objects_is_invalid_fails(self):
         # non-unique array of nested objects is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     {
                         "foo":
@@ -183,35 +183,35 @@ def test_non_unique_array_of_nested_objects_is_invalid_fails(self):
                             },
                     },
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_non_unique_array_of_more_than_two_integers_is_invalid_fails(self):
         # non-unique array of more than two integers is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     1,
                     2,
                     1,
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_true_is_not_equal_to_one_passes(self):
         # true is not equal to one
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 1,
                 True,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_objects_are_non_unique_despite_key_order_fails(self):
         # objects are non-unique despite key order
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     {
                         "a":
@@ -226,23 +226,23 @@ def test_objects_are_non_unique_despite_key_order_fails(self):
                             1,
                     },
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_unique_array_of_strings_is_valid_passes(self):
         # unique array of strings is valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 "foo",
                 "bar",
                 "baz",
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_1_and_true_are_unique_passes(self):
         # [1] and [true] are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 [
                     1,
@@ -251,12 +251,12 @@ def test_1_and_true_are_unique_passes(self):
                     True,
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_different_objects_are_unique_passes(self):
         # different objects are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                     "a":
@@ -271,23 +271,23 @@ def test_different_objects_are_unique_passes(self):
                         1,
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_array_of_integers_is_valid_passes(self):
         # unique array of integers is valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 1,
                 2,
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_more_than_two_arrays_is_invalid_fails(self):
         # non-unique array of more than two arrays is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     [
                         "foo",
@@ -299,13 +299,13 @@ def test_non_unique_array_of_more_than_two_arrays_is_invalid_fails(self):
                         "foo",
                     ],
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_non_unique_array_of_objects_is_invalid_fails(self):
         # non-unique array of objects is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     {
                         "foo":
@@ -316,12 +316,12 @@ def test_non_unique_array_of_objects_is_invalid_fails(self):
                             "bar",
                     },
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_unique_array_of_nested_objects_is_valid_passes(self):
         # unique array of nested objects is valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                     "foo":
@@ -344,13 +344,13 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
                         },
                 },
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_arrays_is_invalid_fails(self):
         # non-unique array of arrays is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     [
                         "foo",
@@ -359,24 +359,24 @@ def test_non_unique_array_of_arrays_is_invalid_fails(self):
                         "foo",
                     ],
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_non_unique_array_of_strings_is_invalid_fails(self):
         # non-unique array of strings is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     "foo",
                     "bar",
                     "foo",
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
     def test_nested1_and_true_are_unique_passes(self):
         # nested [1] and [true] are unique
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 [
                     [
@@ -391,12 +391,12 @@ def test_nested1_and_true_are_unique_passes(self):
                     "foo",
                 ],
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_unique_heterogeneous_types_are_valid_passes(self):
         # unique heterogeneous types are valid
-        UniqueitemsValidation.from_openapi_data_oapg(
+        UniqueitemsValidation.from_openapi_data_(
             [
                 {
                 },
@@ -408,18 +408,18 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
                 1,
                 "{}",
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_non_unique_array_of_integers_is_invalid_fails(self):
         # non-unique array of integers is invalid
         with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-            UniqueitemsValidation.from_openapi_data_oapg(
+            UniqueitemsValidation.from_openapi_data_(
                 [
                     1,
                     1,
                 ],
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_format.py
index 74b8cb45fd2..40ace1f22ee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_format.py
@@ -18,50 +18,50 @@
 
 class TestUriFormat(unittest.TestCase):
     """UriFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        UriFormat.from_openapi_data_oapg(
+        UriFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_reference_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_reference_format.py
index 06b889c5f05..168245287f1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_reference_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_reference_format.py
@@ -18,50 +18,50 @@
 
 class TestUriReferenceFormat(unittest.TestCase):
     """UriReferenceFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        UriReferenceFormat.from_openapi_data_oapg(
+        UriReferenceFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_template_format.py b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_template_format.py
index f53a0d8cab0..b8c71caada6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_template_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/components/schema/test_uri_template_format.py
@@ -18,50 +18,50 @@
 
 class TestUriTemplateFormat(unittest.TestCase):
     """UriTemplateFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def test_all_string_formats_ignore_objects_passes(self):
         # all string formats ignore objects
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             {
             },
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_booleans_passes(self):
         # all string formats ignore booleans
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             False,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_integers_passes(self):
         # all string formats ignore integers
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             12,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_floats_passes(self):
         # all string formats ignore floats
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             13.7,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_arrays_passes(self):
         # all string formats ignore arrays
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             [
             ],
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
     def test_all_string_formats_ignore_nulls_passes(self):
         # all string formats ignore nulls
-        UriTemplateFormat.from_openapi_data_oapg(
+        UriTemplateFormat.from_openapi_data_(
             None,
-            _configuration=self._configuration
+            configuration_=self.configuration_
         )
 
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/test_post.py
index 9ebcda66ddf..07934648a4c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateReq
     """
     RequestBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_no_additional_properties_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+            body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_no_additional_properties_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody',
+                self.configuration_.host + '/requestBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -82,9 +82,9 @@ def test_an_additional_invalid_property_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+                body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -102,9 +102,9 @@ def test_an_additional_valid_property_is_valid_passes(self):
                         True,
                 }
             )
-            body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_oapg(
+            body = post.request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_an_additional_valid_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody',
+                self.configuration_.host + '/requestBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_are_allowed_by_default_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_are_allowed_by_default_request_body/test_post.py
index 0455df590a3..a4e497abfea 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_are_allowed_by_default_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_are_allowed_by_default_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAdditionalpropertiesAreAllowedByDefaultRequestBody(ApiT
     """
     RequestBodyPostAdditionalpropertiesAreAllowedByDefaultRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -48,9 +48,9 @@ def test_additional_properties_are_allowed_passes(self):
                         True,
                 }
             )
-            body = post.request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault.from_openapi_data_oapg(
+            body = post.request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -62,7 +62,7 @@ def test_additional_properties_are_allowed_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAdditionalpropertiesAreAllowedByDefaultRequestBody',
+                self.configuration_.host + '/requestBody/postAdditionalpropertiesAreAllowedByDefaultRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_can_exist_by_itself_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_can_exist_by_itself_request_body/test_post.py
index 74ef2aae146..7e8bbbc14a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_can_exist_by_itself_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_can_exist_by_itself_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAdditionalpropertiesCanExistByItselfRequestBody(ApiTest
     """
     RequestBodyPostAdditionalpropertiesCanExistByItselfRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -45,9 +45,9 @@ def test_an_additional_invalid_property_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself.from_openapi_data_oapg(
+                body = post.request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -61,9 +61,9 @@ def test_an_additional_valid_property_is_valid_passes(self):
                         True,
                 }
             )
-            body = post.request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself.from_openapi_data_oapg(
+            body = post.request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -75,7 +75,7 @@ def test_an_additional_valid_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAdditionalpropertiesCanExistByItselfRequestBody',
+                self.configuration_.host + '/requestBody/postAdditionalpropertiesCanExistByItselfRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_should_not_look_in_applicators_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_should_not_look_in_applicators_request_body/test_post.py
index 74aa4b22082..7f26db68eab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_should_not_look_in_applicators_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_additionalproperties_should_not_look_in_applicators_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAdditionalpropertiesShouldNotLookInApplicatorsRequestBo
     """
     RequestBodyPostAdditionalpropertiesShouldNotLookInApplicatorsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -47,9 +47,9 @@ def test_properties_defined_in_allof_are_not_examined_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_oapg(
+                body = post.request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -65,9 +65,9 @@ def test_valid_test_case_passes(self):
                         True,
                 }
             )
-            body = post.request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_oapg(
+            body = post.request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -79,7 +79,7 @@ def test_valid_test_case_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAdditionalpropertiesShouldNotLookInApplicatorsRequestBody',
+                self.configuration_.host + '/requestBody/postAdditionalpropertiesShouldNotLookInApplicatorsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_combined_with_anyof_oneof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_combined_with_anyof_oneof_request_body/test_post.py
index 5ffa21769aa..61f4a412a0a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_combined_with_anyof_oneof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_combined_with_anyof_oneof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofCombinedWithAnyofOneofRequestBody(ApiTestMixin, un
     """
     RequestBodyPostAllofCombinedWithAnyofOneofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_allof_true_anyof_false_oneof_false_fails(self):
                 2
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_allof_false_anyof_false_oneof_true_fails(self):
                 5
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -70,9 +70,9 @@ def test_allof_false_anyof_true_oneof_true_fails(self):
                 15
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -84,9 +84,9 @@ def test_allof_true_anyof_true_oneof_false_fails(self):
                 6
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -97,9 +97,9 @@ def test_allof_true_anyof_true_oneof_true_passes(self):
             payload = (
                 30
             )
-            body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+            body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -111,7 +111,7 @@ def test_allof_true_anyof_true_oneof_true_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofCombinedWithAnyofOneofRequestBody',
+                self.configuration_.host + '/requestBody/postAllofCombinedWithAnyofOneofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -128,9 +128,9 @@ def test_allof_true_anyof_false_oneof_true_fails(self):
                 10
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -142,9 +142,9 @@ def test_allof_false_anyof_true_oneof_false_fails(self):
                 3
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -156,9 +156,9 @@ def test_allof_false_anyof_false_oneof_false_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_oapg(
+                body = post.request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_request_body/test_post.py
index 4b228df69fd..e799c2c006c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostAllofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -46,9 +46,9 @@ def test_allof_passes(self):
                         2,
                 }
             )
-            body = post.request_body.allof.Allof.from_openapi_data_oapg(
+            body = post.request_body.allof.Allof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -60,7 +60,7 @@ def test_allof_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofRequestBody',
+                self.configuration_.host + '/requestBody/postAllofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -80,9 +80,9 @@ def test_mismatch_first_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof.Allof.from_openapi_data_oapg(
+                body = post.request_body.allof.Allof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -97,9 +97,9 @@ def test_mismatch_second_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof.Allof.from_openapi_data_oapg(
+                body = post.request_body.allof.Allof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -116,9 +116,9 @@ def test_wrong_type_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof.Allof.from_openapi_data_oapg(
+                body = post.request_body.allof.Allof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_simple_types_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_simple_types_request_body/test_post.py
index 2afdbf1e31f..b99ffd4dac0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_simple_types_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_simple_types_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofSimpleTypesRequestBody(ApiTestMixin, unittest.Test
     """
     RequestBodyPostAllofSimpleTypesRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_valid_passes(self):
             payload = (
                 25
             )
-            body = post.request_body.allof_simple_types.AllofSimpleTypes.from_openapi_data_oapg(
+            body = post.request_body.allof_simple_types.AllofSimpleTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofSimpleTypesRequestBody',
+                self.configuration_.host + '/requestBody/postAllofSimpleTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_mismatch_one_fails(self):
                 35
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_simple_types.AllofSimpleTypes.from_openapi_data_oapg(
+                body = post.request_body.allof_simple_types.AllofSimpleTypes.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_base_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_base_schema_request_body/test_post.py
index 3744e467683..9c8ef3a369f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_base_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_base_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofWithBaseSchemaRequestBody(ApiTestMixin, unittest.T
     """
     RequestBodyPostAllofWithBaseSchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -48,9 +48,9 @@ def test_valid_passes(self):
                         None,
                 }
             )
-            body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_oapg(
+            body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -62,7 +62,7 @@ def test_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofWithBaseSchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAllofWithBaseSchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -84,9 +84,9 @@ def test_mismatch_first_allof_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -103,9 +103,9 @@ def test_mismatch_base_schema_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -120,9 +120,9 @@ def test_mismatch_both_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -139,9 +139,9 @@ def test_mismatch_second_allof_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_base_schema.AllofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_one_empty_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_one_empty_schema_request_body/test_post.py
index 5afeb49c488..c7ca4a883ec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_one_empty_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_one_empty_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofWithOneEmptySchemaRequestBody(ApiTestMixin, unitte
     """
     RequestBodyPostAllofWithOneEmptySchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_any_data_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_any_data_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofWithOneEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAllofWithOneEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_first_empty_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_first_empty_schema_request_body/test_post.py
index b3f0b17d146..354cf7a8532 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_first_empty_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_first_empty_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofWithTheFirstEmptySchemaRequestBody(ApiTestMixin, u
     """
     RequestBodyPostAllofWithTheFirstEmptySchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_string_is_invalid_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_number_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofWithTheFirstEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAllofWithTheFirstEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_last_empty_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_last_empty_schema_request_body/test_post.py
index b9a33031203..9957bdc576b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_last_empty_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_the_last_empty_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofWithTheLastEmptySchemaRequestBody(ApiTestMixin, un
     """
     RequestBodyPostAllofWithTheLastEmptySchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_string_is_invalid_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema.from_openapi_data_oapg(
+                body = post.request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_number_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofWithTheLastEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAllofWithTheLastEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_two_empty_schemas_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_two_empty_schemas_request_body/test_post.py
index cef6c1e0700..6aeeb29477b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_two_empty_schemas_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_allof_with_two_empty_schemas_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAllofWithTwoEmptySchemasRequestBody(ApiTestMixin, unitt
     """
     RequestBodyPostAllofWithTwoEmptySchemasRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_any_data_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas.from_openapi_data_oapg(
+            body = post.request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_any_data_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAllofWithTwoEmptySchemasRequestBody',
+                self.configuration_.host + '/requestBody/postAllofWithTwoEmptySchemasRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_complex_types_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_complex_types_request_body/test_post.py
index 14f8f01648c..290eff9295f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_complex_types_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_complex_types_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAnyofComplexTypesRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostAnyofComplexTypesRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_second_anyof_valid_complex_passes(self):
                         "baz",
                 }
             )
-            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_oapg(
+            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_second_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofComplexTypesRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofComplexTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -80,9 +80,9 @@ def test_neither_anyof_valid_complex_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_oapg(
+                body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -98,9 +98,9 @@ def test_both_anyof_valid_complex_passes(self):
                         2,
                 }
             )
-            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_oapg(
+            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -112,7 +112,7 @@ def test_both_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofComplexTypesRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofComplexTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -131,9 +131,9 @@ def test_first_anyof_valid_complex_passes(self):
                         2,
                 }
             )
-            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_oapg(
+            body = post.request_body.anyof_complex_types.AnyofComplexTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -145,7 +145,7 @@ def test_first_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofComplexTypesRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofComplexTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_request_body/test_post.py
index b2cde3defd5..81b3671b453 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAnyofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostAnyofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_second_anyof_valid_passes(self):
             payload = (
                 2.5
             )
-            body = post.request_body.anyof.Anyof.from_openapi_data_oapg(
+            body = post.request_body.anyof.Anyof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_second_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_neither_anyof_valid_fails(self):
                 1.5
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.anyof.Anyof.from_openapi_data_oapg(
+                body = post.request_body.anyof.Anyof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_both_anyof_valid_passes(self):
             payload = (
                 3
             )
-            body = post.request_body.anyof.Anyof.from_openapi_data_oapg(
+            body = post.request_body.anyof.Anyof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_both_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -115,9 +115,9 @@ def test_first_anyof_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.anyof.Anyof.from_openapi_data_oapg(
+            body = post.request_body.anyof.Anyof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_first_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_base_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_base_schema_request_body/test_post.py
index fe40e7a931e..dc561865352 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_base_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_base_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAnyofWithBaseSchemaRequestBody(ApiTestMixin, unittest.T
     """
     RequestBodyPostAnyofWithBaseSchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_one_anyof_valid_passes(self):
             payload = (
                 "foobar"
             )
-            body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_oapg(
+            body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_one_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofWithBaseSchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofWithBaseSchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_both_anyof_invalid_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -86,9 +86,9 @@ def test_mismatch_base_schema_fails(self):
                 3
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.anyof_with_base_schema.AnyofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_one_empty_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_one_empty_schema_request_body/test_post.py
index 0f412142ec9..f1f3c9696c0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_one_empty_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_anyof_with_one_empty_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostAnyofWithOneEmptySchemaRequestBody(ApiTestMixin, unitte
     """
     RequestBodyPostAnyofWithOneEmptySchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_string_is_valid_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_string_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofWithOneEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofWithOneEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -71,9 +71,9 @@ def test_number_is_valid_passes(self):
             payload = (
                 123
             )
-            body = post.request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -85,7 +85,7 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postAnyofWithOneEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postAnyofWithOneEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_array_type_matches_arrays_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_array_type_matches_arrays_request_body/test_post.py
index 9a72fa33d3a..c710983711c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_array_type_matches_arrays_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_array_type_matches_arrays_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostArrayTypeMatchesArraysRequestBody(ApiTestMixin, unittes
     """
     RequestBodyPostArrayTypeMatchesArraysRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_a_float_is_not_an_array_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_a_boolean_is_not_an_array_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -70,9 +70,9 @@ def test_null_is_not_an_array_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_an_object_is_not_an_array_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -99,9 +99,9 @@ def test_a_string_is_not_an_array_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -113,9 +113,9 @@ def test_an_array_is_an_array_passes(self):
                 [
                 ]
             )
-            body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+            body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -127,7 +127,7 @@ def test_an_array_is_an_array_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postArrayTypeMatchesArraysRequestBody',
+                self.configuration_.host + '/requestBody/postArrayTypeMatchesArraysRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -144,9 +144,9 @@ def test_an_integer_is_not_an_array_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_oapg(
+                body = post.request_body.array_type_matches_arrays.ArrayTypeMatchesArrays.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_boolean_type_matches_booleans_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_boolean_type_matches_booleans_request_body/test_post.py
index c446345c1d4..a229cb36a4c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_boolean_type_matches_booleans_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_boolean_type_matches_booleans_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostBooleanTypeMatchesBooleansRequestBody(ApiTestMixin, uni
     """
     RequestBodyPostBooleanTypeMatchesBooleansRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_an_empty_string_is_not_a_boolean_fails(self):
                 ""
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_a_float_is_not_a_boolean_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -70,9 +70,9 @@ def test_null_is_not_a_boolean_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -84,9 +84,9 @@ def test_zero_is_not_a_boolean_fails(self):
                 0
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -99,9 +99,9 @@ def test_an_array_is_not_a_boolean_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -113,9 +113,9 @@ def test_a_string_is_not_a_boolean_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -126,9 +126,9 @@ def test_false_is_a_boolean_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -140,7 +140,7 @@ def test_false_is_a_boolean_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postBooleanTypeMatchesBooleansRequestBody',
+                self.configuration_.host + '/requestBody/postBooleanTypeMatchesBooleansRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -157,9 +157,9 @@ def test_an_integer_is_not_a_boolean_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -170,9 +170,9 @@ def test_true_is_a_boolean_passes(self):
             payload = (
                 True
             )
-            body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+            body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -184,7 +184,7 @@ def test_true_is_a_boolean_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postBooleanTypeMatchesBooleansRequestBody',
+                self.configuration_.host + '/requestBody/postBooleanTypeMatchesBooleansRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -202,9 +202,9 @@ def test_an_object_is_not_a_boolean_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_oapg(
+                body = post.request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_int_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_int_request_body/test_post.py
index d96a7715ebb..a80ae31b4fa 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_int_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_int_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostByIntRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostByIntRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_int_by_int_fail_fails(self):
                 7
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.by_int.ByInt.from_openapi_data_oapg(
+                body = post.request_body.by_int.ByInt.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_int_by_int_passes(self):
             payload = (
                 10
             )
-            body = post.request_body.by_int.ByInt.from_openapi_data_oapg(
+            body = post.request_body.by_int.ByInt.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_int_by_int_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postByIntRequestBody',
+                self.configuration_.host + '/requestBody/postByIntRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -85,9 +85,9 @@ def test_ignores_non_numbers_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body.by_int.ByInt.from_openapi_data_oapg(
+            body = post.request_body.by_int.ByInt.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postByIntRequestBody',
+                self.configuration_.host + '/requestBody/postByIntRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_number_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_number_request_body/test_post.py
index a27b2ca4961..d4f3eb457a6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_number_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_number_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostByNumberRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostByNumberRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_45_is_multiple_of15_passes(self):
             payload = (
                 4.5
             )
-            body = post.request_body.by_number.ByNumber.from_openapi_data_oapg(
+            body = post.request_body.by_number.ByNumber.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_45_is_multiple_of15_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postByNumberRequestBody',
+                self.configuration_.host + '/requestBody/postByNumberRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_35_is_not_multiple_of15_fails(self):
                 35
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.by_number.ByNumber.from_openapi_data_oapg(
+                body = post.request_body.by_number.ByNumber.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_zero_is_multiple_of_anything_passes(self):
             payload = (
                 0
             )
-            body = post.request_body.by_number.ByNumber.from_openapi_data_oapg(
+            body = post.request_body.by_number.ByNumber.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_zero_is_multiple_of_anything_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postByNumberRequestBody',
+                self.configuration_.host + '/requestBody/postByNumberRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_small_number_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_small_number_request_body/test_post.py
index 494c2009581..92a0cedfcf3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_small_number_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_by_small_number_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostBySmallNumberRequestBody(ApiTestMixin, unittest.TestCas
     """
     RequestBodyPostBySmallNumberRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_000751_is_not_multiple_of00001_fails(self):
                 0.00751
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.by_small_number.BySmallNumber.from_openapi_data_oapg(
+                body = post.request_body.by_small_number.BySmallNumber.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_00075_is_multiple_of00001_passes(self):
             payload = (
                 0.0075
             )
-            body = post.request_body.by_small_number.BySmallNumber.from_openapi_data_oapg(
+            body = post.request_body.by_small_number.BySmallNumber.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_00075_is_multiple_of00001_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postBySmallNumberRequestBody',
+                self.configuration_.host + '/requestBody/postBySmallNumberRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_date_time_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_date_time_format_request_body/test_post.py
index 12773daab34..4b27db4fc45 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_date_time_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_date_time_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostDateTimeFormatRequestBody(ApiTestMixin, unittest.TestCa
     """
     RequestBodyPostDateTimeFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_oapg(
+            body = post.request_body.date_time_format.DateTimeFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postDateTimeFormatRequestBody',
+                self.configuration_.host + '/requestBody/postDateTimeFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_email_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_email_format_request_body/test_post.py
index 51722d6d80f..85968e1c943 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_email_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_email_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEmailFormatRequestBody(ApiTestMixin, unittest.TestCase)
     """
     RequestBodyPostEmailFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.email_format.EmailFormat.from_openapi_data_oapg(
+            body = post.request_body.email_format.EmailFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEmailFormatRequestBody',
+                self.configuration_.host + '/requestBody/postEmailFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with0_does_not_match_false_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with0_does_not_match_false_request_body/test_post.py
index bbf33107d97..bed89a3b8ad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with0_does_not_match_false_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with0_does_not_match_false_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumWith0DoesNotMatchFalseRequestBody(ApiTestMixin, uni
     """
     RequestBodyPostEnumWith0DoesNotMatchFalseRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_integer_zero_is_valid_passes(self):
             payload = (
                 0
             )
-            body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+            body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_integer_zero_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWith0DoesNotMatchFalseRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWith0DoesNotMatchFalseRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -71,9 +71,9 @@ def test_float_zero_is_valid_passes(self):
             payload = (
                 0.0
             )
-            body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+            body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -85,7 +85,7 @@ def test_float_zero_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWith0DoesNotMatchFalseRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWith0DoesNotMatchFalseRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_false_is_invalid_fails(self):
                 False
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_oapg(
+                body = post.request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with1_does_not_match_true_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with1_does_not_match_true_request_body/test_post.py
index cc66938944d..04e182f8bfc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with1_does_not_match_true_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with1_does_not_match_true_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumWith1DoesNotMatchTrueRequestBody(ApiTestMixin, unit
     """
     RequestBodyPostEnumWith1DoesNotMatchTrueRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_true_is_invalid_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+                body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_integer_one_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+            body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_integer_one_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWith1DoesNotMatchTrueRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWith1DoesNotMatchTrueRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -85,9 +85,9 @@ def test_float_one_is_valid_passes(self):
             payload = (
                 1.0
             )
-            body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_oapg(
+            body = post.request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_float_one_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWith1DoesNotMatchTrueRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWith1DoesNotMatchTrueRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_escaped_characters_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_escaped_characters_request_body/test_post.py
index df97d501ecd..2f1a44e3b7a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_escaped_characters_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_escaped_characters_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumWithEscapedCharactersRequestBody(ApiTestMixin, unit
     """
     RequestBodyPostEnumWithEscapedCharactersRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_member2_is_valid_passes(self):
             payload = (
                 "foo\rbar"
             )
-            body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_oapg(
+            body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_member2_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWithEscapedCharactersRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWithEscapedCharactersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -71,9 +71,9 @@ def test_member1_is_valid_passes(self):
             payload = (
                 "foo\nbar"
             )
-            body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_oapg(
+            body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -85,7 +85,7 @@ def test_member1_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWithEscapedCharactersRequestBody',
+                self.configuration_.host + '/requestBody/postEnumWithEscapedCharactersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_another_string_is_invalid_fails(self):
                 "abc"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_oapg(
+                body = post.request_body.enum_with_escaped_characters.EnumWithEscapedCharacters.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_false_does_not_match0_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_false_does_not_match0_request_body/test_post.py
index 5cf4beaabde..76ba9096c4d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_false_does_not_match0_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_false_does_not_match0_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumWithFalseDoesNotMatch0RequestBody(ApiTestMixin, uni
     """
     RequestBodyPostEnumWithFalseDoesNotMatch0RequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_false_is_valid_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+            body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_false_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWithFalseDoesNotMatch0RequestBody',
+                self.configuration_.host + '/requestBody/postEnumWithFalseDoesNotMatch0RequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_float_zero_is_invalid_fails(self):
                 0.0
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+                body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -86,9 +86,9 @@ def test_integer_zero_is_invalid_fails(self):
                 0
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_oapg(
+                body = post.request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_true_does_not_match1_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_true_does_not_match1_request_body/test_post.py
index 3de3422e465..6ced485358b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_true_does_not_match1_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enum_with_true_does_not_match1_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumWithTrueDoesNotMatch1RequestBody(ApiTestMixin, unit
     """
     RequestBodyPostEnumWithTrueDoesNotMatch1RequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_float_one_is_invalid_fails(self):
                 1.0
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+                body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_true_is_valid_passes(self):
             payload = (
                 True
             )
-            body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+            body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_true_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumWithTrueDoesNotMatch1RequestBody',
+                self.configuration_.host + '/requestBody/postEnumWithTrueDoesNotMatch1RequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -86,9 +86,9 @@ def test_integer_one_is_invalid_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_oapg(
+                body = post.request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enums_in_properties_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enums_in_properties_request_body/test_post.py
index 87bb3d0a0f4..bd302e19d1e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enums_in_properties_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_enums_in_properties_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostEnumsInPropertiesRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostEnumsInPropertiesRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_missing_optional_property_is_valid_passes(self):
                         "bar",
                 }
             )
-            body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+            body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_missing_optional_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumsInPropertiesRequestBody',
+                self.configuration_.host + '/requestBody/postEnumsInPropertiesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -80,9 +80,9 @@ def test_wrong_foo_value_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -98,9 +98,9 @@ def test_both_properties_are_valid_passes(self):
                         "bar",
                 }
             )
-            body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+            body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -112,7 +112,7 @@ def test_both_properties_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postEnumsInPropertiesRequestBody',
+                self.configuration_.host + '/requestBody/postEnumsInPropertiesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -134,9 +134,9 @@ def test_wrong_bar_value_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -149,9 +149,9 @@ def test_missing_all_properties_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -166,9 +166,9 @@ def test_missing_required_property_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_oapg(
+                body = post.request_body.enums_in_properties.EnumsInProperties.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_forbidden_property_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_forbidden_property_request_body/test_post.py
index d44d2cf227f..9d07cf733d2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_forbidden_property_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_forbidden_property_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostForbiddenPropertyRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostForbiddenPropertyRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -47,9 +47,9 @@ def test_property_present_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.forbidden_property.ForbiddenProperty.from_openapi_data_oapg(
+                body = post.request_body.forbidden_property.ForbiddenProperty.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -65,9 +65,9 @@ def test_property_absent_passes(self):
                         2,
                 }
             )
-            body = post.request_body.forbidden_property.ForbiddenProperty.from_openapi_data_oapg(
+            body = post.request_body.forbidden_property.ForbiddenProperty.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -79,7 +79,7 @@ def test_property_absent_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postForbiddenPropertyRequestBody',
+                self.configuration_.host + '/requestBody/postForbiddenPropertyRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_hostname_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_hostname_format_request_body/test_post.py
index 82168138557..ba6ebc4f8fb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_hostname_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_hostname_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostHostnameFormatRequestBody(ApiTestMixin, unittest.TestCa
     """
     RequestBodyPostHostnameFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_oapg(
+            body = post.request_body.hostname_format.HostnameFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postHostnameFormatRequestBody',
+                self.configuration_.host + '/requestBody/postHostnameFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_integer_type_matches_integers_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_integer_type_matches_integers_request_body/test_post.py
index 5a282d0723b..151982f852b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_integer_type_matches_integers_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_integer_type_matches_integers_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostIntegerTypeMatchesIntegersRequestBody(ApiTestMixin, uni
     """
     RequestBodyPostIntegerTypeMatchesIntegersRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -43,9 +43,9 @@ def test_an_object_is_not_an_integer_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -57,9 +57,9 @@ def test_a_string_is_not_an_integer_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -71,9 +71,9 @@ def test_null_is_not_an_integer_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -84,9 +84,9 @@ def test_a_float_with_zero_fractional_part_is_an_integer_passes(self):
             payload = (
                 1.0
             )
-            body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -98,7 +98,7 @@ def test_a_float_with_zero_fractional_part_is_an_integer_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIntegerTypeMatchesIntegersRequestBody',
+                self.configuration_.host + '/requestBody/postIntegerTypeMatchesIntegersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -115,9 +115,9 @@ def test_a_float_is_not_an_integer_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -129,9 +129,9 @@ def test_a_boolean_is_not_an_integer_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -142,9 +142,9 @@ def test_an_integer_is_an_integer_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+            body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -156,7 +156,7 @@ def test_an_integer_is_an_integer_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIntegerTypeMatchesIntegersRequestBody',
+                self.configuration_.host + '/requestBody/postIntegerTypeMatchesIntegersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -173,9 +173,9 @@ def test_a_string_is_still_not_an_integer_even_if_it_looks_like_one_fails(self):
                 "1"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -188,9 +188,9 @@ def test_an_array_is_not_an_integer_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_oapg(
+                body = post.request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/test_post.py
index 212628c6526..4c36c7dcd8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfR
     """
     RequestBodyPostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_always_invalid_but_naive_implementations_may_raise_an_overflow_error_fa
                 1.0E308
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_oapg(
+                body = post.request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_valid_integer_with_multipleof_float_passes(self):
             payload = (
                 123456789
             )
-            body = post.request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_oapg(
+            body = post.request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_valid_integer_with_multipleof_float_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfRequestBody',
+                self.configuration_.host + '/requestBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_string_value_for_default_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_string_value_for_default_request_body/test_post.py
index 0c2174e681e..092635ef59f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_string_value_for_default_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_invalid_string_value_for_default_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostInvalidStringValueForDefaultRequestBody(ApiTestMixin, u
     """
     RequestBodyPostInvalidStringValueForDefaultRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_valid_when_property_is_specified_passes(self):
                         "good",
                 }
             )
-            body = post.request_body.invalid_string_value_for_default.InvalidStringValueForDefault.from_openapi_data_oapg(
+            body = post.request_body.invalid_string_value_for_default.InvalidStringValueForDefault.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_valid_when_property_is_specified_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postInvalidStringValueForDefaultRequestBody',
+                self.configuration_.host + '/requestBody/postInvalidStringValueForDefaultRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -75,9 +75,9 @@ def test_still_valid_when_the_invalid_default_is_used_passes(self):
                 {
                 }
             )
-            body = post.request_body.invalid_string_value_for_default.InvalidStringValueForDefault.from_openapi_data_oapg(
+            body = post.request_body.invalid_string_value_for_default.InvalidStringValueForDefault.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -89,7 +89,7 @@ def test_still_valid_when_the_invalid_default_is_used_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postInvalidStringValueForDefaultRequestBody',
+                self.configuration_.host + '/requestBody/postInvalidStringValueForDefaultRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv4_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv4_format_request_body/test_post.py
index 96758bce583..7323323806d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv4_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv4_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostIpv4FormatRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostIpv4FormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_oapg(
+            body = post.request_body.ipv4_format.Ipv4Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv4FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv4FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv6_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv6_format_request_body/test_post.py
index 4f2801c08b9..3b88f80ee46 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv6_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ipv6_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostIpv6FormatRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostIpv6FormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_oapg(
+            body = post.request_body.ipv6_format.Ipv6Format.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postIpv6FormatRequestBody',
+                self.configuration_.host + '/requestBody/postIpv6FormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_json_pointer_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_json_pointer_format_request_body/test_post.py
index bb2c37d5246..b6a449060ce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_json_pointer_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_json_pointer_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostJsonPointerFormatRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostJsonPointerFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_oapg(
+            body = post.request_body.json_pointer_format.JsonPointerFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postJsonPointerFormatRequestBody',
+                self.configuration_.host + '/requestBody/postJsonPointerFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_request_body/test_post.py
index 42a86a15118..e54661e96fc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaximumValidationRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostMaximumValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_below_the_maximum_is_valid_passes(self):
             payload = (
                 2.6
             )
-            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_below_the_maximum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -71,9 +71,9 @@ def test_boundary_point_is_valid_passes(self):
             payload = (
                 3.0
             )
-            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -85,7 +85,7 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_above_the_maximum_is_invalid_fails(self):
                 3.5
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_oapg(
+                body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -115,9 +115,9 @@ def test_ignores_non_numbers_passes(self):
             payload = (
                 "x"
             )
-            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation.MaximumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_with_unsigned_integer_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_with_unsigned_integer_request_body/test_post.py
index 234d2be7cb1..958c7430b2f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_with_unsigned_integer_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maximum_validation_with_unsigned_integer_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaximumValidationWithUnsignedIntegerRequestBody(ApiTest
     """
     RequestBodyPostMaximumValidationWithUnsignedIntegerRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_below_the_maximum_is_invalid_passes(self):
             payload = (
                 299.97
             )
-            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_below_the_maximum_is_invalid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_above_the_maximum_is_invalid_fails(self):
                 300.5
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+                body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_boundary_point_integer_is_valid_passes(self):
             payload = (
                 300
             )
-            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_boundary_point_integer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -115,9 +115,9 @@ def test_boundary_point_float_is_valid_passes(self):
             payload = (
                 300.0
             )
-            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_oapg(
+            body = post.request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_boundary_point_float_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMaximumValidationWithUnsignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxitems_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxitems_validation_request_body/test_post.py
index 2c2fa4e8c30..024075583c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxitems_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxitems_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaxitemsValidationRequestBody(ApiTestMixin, unittest.Te
     """
     RequestBodyPostMaxitemsValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -46,9 +46,9 @@ def test_too_long_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -59,9 +59,9 @@ def test_ignores_non_arrays_passes(self):
             payload = (
                 "foobar"
             )
-            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -73,7 +73,7 @@ def test_ignores_non_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -91,9 +91,9 @@ def test_shorter_is_valid_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -105,7 +105,7 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -124,9 +124,9 @@ def test_exact_length_is_valid_passes(self):
                     2,
                 ]
             )
-            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.maxitems_validation.MaxitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -138,7 +138,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxlength_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxlength_validation_request_body/test_post.py
index 20a08e024d2..d491d6fbe30 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxlength_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxlength_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaxlengthValidationRequestBody(ApiTestMixin, unittest.T
     """
     RequestBodyPostMaxlengthValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_too_long_is_invalid_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_oapg(
+                body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_ignores_non_strings_passes(self):
             payload = (
                 100
             )
-            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_ignores_non_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -85,9 +85,9 @@ def test_shorter_is_valid_passes(self):
             payload = (
                 "f"
             )
-            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -115,9 +115,9 @@ def test_two_supplementary_unicode_code_points_is_long_enough_passes(self):
             payload = (
                 "💩💩"
             )
-            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_two_supplementary_unicode_code_points_is_long_enough_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -145,9 +145,9 @@ def test_exact_length_is_valid_passes(self):
             payload = (
                 "fo"
             )
-            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.maxlength_validation.MaxlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -159,7 +159,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties0_means_the_object_is_empty_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties0_means_the_object_is_empty_request_body/test_post.py
index 318d5893dd3..2cb763d606d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties0_means_the_object_is_empty_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties0_means_the_object_is_empty_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaxproperties0MeansTheObjectIsEmptyRequestBody(ApiTestM
     """
     RequestBodyPostMaxproperties0MeansTheObjectIsEmptyRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_no_properties_is_valid_passes(self):
                 {
                 }
             )
-            body = post.request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_oapg(
+            body = post.request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_no_properties_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxproperties0MeansTheObjectIsEmptyRequestBody',
+                self.configuration_.host + '/requestBody/postMaxproperties0MeansTheObjectIsEmptyRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -76,9 +76,9 @@ def test_one_property_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_oapg(
+                body = post.request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties_validation_request_body/test_post.py
index 551e51c5710..6da035cb6e9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_maxproperties_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMaxpropertiesValidationRequestBody(ApiTestMixin, unitte
     """
     RequestBodyPostMaxpropertiesValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -49,9 +49,9 @@ def test_too_long_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+                body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -66,9 +66,9 @@ def test_ignores_arrays_passes(self):
                     3,
                 ]
             )
-            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -80,7 +80,7 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -96,9 +96,9 @@ def test_ignores_other_non_objects_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -110,7 +110,7 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -126,9 +126,9 @@ def test_ignores_strings_passes(self):
             payload = (
                 "foobar"
             )
-            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -140,7 +140,7 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -159,9 +159,9 @@ def test_shorter_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -173,7 +173,7 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -194,9 +194,9 @@ def test_exact_length_is_valid_passes(self):
                         2,
                 }
             )
-            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.maxproperties_validation.MaxpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -208,7 +208,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMaxpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMaxpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_request_body/test_post.py
index d00d2aa3ea6..f9efe7bd304 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMinimumValidationRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostMinimumValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_boundary_point_is_valid_passes(self):
             payload = (
                 1.1
             )
-            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_below_the_minimum_is_invalid_fails(self):
                 0.6
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_oapg(
+                body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_above_the_minimum_is_valid_passes(self):
             payload = (
                 2.6
             )
-            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -115,9 +115,9 @@ def test_ignores_non_numbers_passes(self):
             payload = (
                 "x"
             )
-            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation.MinimumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_with_signed_integer_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_with_signed_integer_request_body/test_post.py
index 649a9024b82..cafaf3688c4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_with_signed_integer_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minimum_validation_with_signed_integer_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMinimumValidationWithSignedIntegerRequestBody(ApiTestMi
     """
     RequestBodyPostMinimumValidationWithSignedIntegerRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_boundary_point_is_valid_passes(self):
             payload = (
                 -2
             )
-            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -71,9 +71,9 @@ def test_positive_above_the_minimum_is_valid_passes(self):
             payload = (
                 0
             )
-            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -85,7 +85,7 @@ def test_positive_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_int_below_the_minimum_is_invalid_fails(self):
                 -3
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+                body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -116,9 +116,9 @@ def test_float_below_the_minimum_is_invalid_fails(self):
                 -2.0001
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+                body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -129,9 +129,9 @@ def test_boundary_point_with_float_is_valid_passes(self):
             payload = (
                 -2.0
             )
-            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -143,7 +143,7 @@ def test_boundary_point_with_float_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -159,9 +159,9 @@ def test_negative_above_the_minimum_is_valid_passes(self):
             payload = (
                 -1
             )
-            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -173,7 +173,7 @@ def test_negative_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -189,9 +189,9 @@ def test_ignores_non_numbers_passes(self):
             payload = (
                 "x"
             )
-            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_oapg(
+            body = post.request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -203,7 +203,7 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
+                self.configuration_.host + '/requestBody/postMinimumValidationWithSignedIntegerRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minitems_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minitems_validation_request_body/test_post.py
index 76fd31a068d..57f9dce88a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minitems_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minitems_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMinitemsValidationRequestBody(ApiTestMixin, unittest.Te
     """
     RequestBodyPostMinitemsValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -43,9 +43,9 @@ def test_too_short_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_ignores_non_arrays_passes(self):
             payload = (
                 ""
             )
-            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -70,7 +70,7 @@ def test_ignores_non_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -89,9 +89,9 @@ def test_longer_is_valid_passes(self):
                     2,
                 ]
             )
-            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -103,7 +103,7 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -121,9 +121,9 @@ def test_exact_length_is_valid_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.minitems_validation.MinitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -135,7 +135,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minlength_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minlength_validation_request_body/test_post.py
index 284ee45bcbe..d5461e0a767 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minlength_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minlength_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMinlengthValidationRequestBody(ApiTestMixin, unittest.T
     """
     RequestBodyPostMinlengthValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_too_short_is_invalid_fails(self):
                 "f"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_oapg(
+                body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_one_supplementary_unicode_code_point_is_not_long_enough_fails(self):
                 "💩"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_oapg(
+                body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -69,9 +69,9 @@ def test_longer_is_valid_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -83,7 +83,7 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -99,9 +99,9 @@ def test_ignores_non_strings_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -113,7 +113,7 @@ def test_ignores_non_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -129,9 +129,9 @@ def test_exact_length_is_valid_passes(self):
             payload = (
                 "fo"
             )
-            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_oapg(
+            body = post.request_body.minlength_validation.MinlengthValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -143,7 +143,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinlengthValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinlengthValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minproperties_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minproperties_validation_request_body/test_post.py
index 16975dbb722..87eeca78c02 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minproperties_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_minproperties_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostMinpropertiesValidationRequestBody(ApiTestMixin, unitte
     """
     RequestBodyPostMinpropertiesValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_ignores_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_ignores_other_non_objects_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -104,9 +104,9 @@ def test_too_short_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+                body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -117,9 +117,9 @@ def test_ignores_strings_passes(self):
             payload = (
                 ""
             )
-            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -131,7 +131,7 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -152,9 +152,9 @@ def test_longer_is_valid_passes(self):
                         2,
                 }
             )
-            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -166,7 +166,7 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -185,9 +185,9 @@ def test_exact_length_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.minproperties_validation.MinpropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -199,7 +199,7 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postMinpropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postMinpropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_allof_to_check_validation_semantics_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_allof_to_check_validation_semantics_request_body/test_post.py
index fc317bbeaf5..69b3b998e16 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_allof_to_check_validation_semantics_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_allof_to_check_validation_semantics_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNestedAllofToCheckValidationSemanticsRequestBody(ApiTes
     """
     RequestBodyPostNestedAllofToCheckValidationSemanticsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_anything_non_null_is_invalid_fails(self):
                 123
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics.from_openapi_data_oapg(
+                body = post.request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_null_is_valid_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics.from_openapi_data_oapg(
+            body = post.request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNestedAllofToCheckValidationSemanticsRequestBody',
+                self.configuration_.host + '/requestBody/postNestedAllofToCheckValidationSemanticsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_anyof_to_check_validation_semantics_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_anyof_to_check_validation_semantics_request_body/test_post.py
index 1af8c4c9be0..a09d449731b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_anyof_to_check_validation_semantics_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_anyof_to_check_validation_semantics_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNestedAnyofToCheckValidationSemanticsRequestBody(ApiTes
     """
     RequestBodyPostNestedAnyofToCheckValidationSemanticsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_anything_non_null_is_invalid_fails(self):
                 123
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics.from_openapi_data_oapg(
+                body = post.request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_null_is_valid_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics.from_openapi_data_oapg(
+            body = post.request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNestedAnyofToCheckValidationSemanticsRequestBody',
+                self.configuration_.host + '/requestBody/postNestedAnyofToCheckValidationSemanticsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_items_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_items_request_body/test_post.py
index 41112e3f407..6ee3495671b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_items_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_items_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNestedItemsRequestBody(ApiTestMixin, unittest.TestCase)
     """
     RequestBodyPostNestedItemsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -70,9 +70,9 @@ def test_valid_nested_array_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.nested_items.NestedItems.from_openapi_data_oapg(
+            body = post.request_body.nested_items.NestedItems.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -84,7 +84,7 @@ def test_valid_nested_array_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNestedItemsRequestBody',
+                self.configuration_.host + '/requestBody/postNestedItemsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -130,9 +130,9 @@ def test_nested_array_with_invalid_type_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nested_items.NestedItems.from_openapi_data_oapg(
+                body = post.request_body.nested_items.NestedItems.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -167,9 +167,9 @@ def test_not_deep_enough_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nested_items.NestedItems.from_openapi_data_oapg(
+                body = post.request_body.nested_items.NestedItems.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_oneof_to_check_validation_semantics_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_oneof_to_check_validation_semantics_request_body/test_post.py
index f9e8a3512b1..771e98ec2ec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_oneof_to_check_validation_semantics_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nested_oneof_to_check_validation_semantics_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNestedOneofToCheckValidationSemanticsRequestBody(ApiTes
     """
     RequestBodyPostNestedOneofToCheckValidationSemanticsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_anything_non_null_is_invalid_fails(self):
                 123
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics.from_openapi_data_oapg(
+                body = post.request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_null_is_valid_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics.from_openapi_data_oapg(
+            body = post.request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNestedOneofToCheckValidationSemanticsRequestBody',
+                self.configuration_.host + '/requestBody/postNestedOneofToCheckValidationSemanticsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_more_complex_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_more_complex_schema_request_body/test_post.py
index 45a54df9c8d..6f49afc5cf6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_more_complex_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_more_complex_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNotMoreComplexSchemaRequestBody(ApiTestMixin, unittest.
     """
     RequestBodyPostNotMoreComplexSchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_other_match_passes(self):
                         1,
                 }
             )
-            body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_oapg(
+            body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_other_match_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNotMoreComplexSchemaRequestBody',
+                self.configuration_.host + '/requestBody/postNotMoreComplexSchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_mismatch_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_oapg(
+                body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -91,9 +91,9 @@ def test_match_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_oapg(
+            body = post.request_body.not_more_complex_schema.NotMoreComplexSchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -105,7 +105,7 @@ def test_match_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNotMoreComplexSchemaRequestBody',
+                self.configuration_.host + '/requestBody/postNotMoreComplexSchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_request_body/test_post.py
index 3c3e64e059d..739b6e925e8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_not_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNotRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostNotRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_allowed_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body._not._Not.from_openapi_data_oapg(
+            body = post.request_body._not._Not.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_allowed_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNotRequestBody',
+                self.configuration_.host + '/requestBody/postNotRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_disallowed_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body._not._Not.from_openapi_data_oapg(
+                body = post.request_body._not._Not.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nul_characters_in_strings_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nul_characters_in_strings_request_body/test_post.py
index b73d8a04d9d..7d7e3e48ec7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nul_characters_in_strings_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_nul_characters_in_strings_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNulCharactersInStringsRequestBody(ApiTestMixin, unittes
     """
     RequestBodyPostNulCharactersInStringsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_match_string_with_nul_passes(self):
             payload = (
                 "hello\x00there"
             )
-            body = post.request_body.nul_characters_in_strings.NulCharactersInStrings.from_openapi_data_oapg(
+            body = post.request_body.nul_characters_in_strings.NulCharactersInStrings.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_match_string_with_nul_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNulCharactersInStringsRequestBody',
+                self.configuration_.host + '/requestBody/postNulCharactersInStringsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_do_not_match_string_lacking_nul_fails(self):
                 "hellothere"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.nul_characters_in_strings.NulCharactersInStrings.from_openapi_data_oapg(
+                body = post.request_body.nul_characters_in_strings.NulCharactersInStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_null_type_matches_only_the_null_object_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_null_type_matches_only_the_null_object_request_body/test_post.py
index 338f75483cc..617aa73a7d5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_null_type_matches_only_the_null_object_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_null_type_matches_only_the_null_object_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNullTypeMatchesOnlyTheNullObjectRequestBody(ApiTestMixi
     """
     RequestBodyPostNullTypeMatchesOnlyTheNullObjectRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_a_float_is_not_null_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -57,9 +57,9 @@ def test_an_object_is_not_null_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -71,9 +71,9 @@ def test_false_is_not_null_fails(self):
                 False
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_an_integer_is_not_null_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -99,9 +99,9 @@ def test_true_is_not_null_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -113,9 +113,9 @@ def test_zero_is_not_null_fails(self):
                 0
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -127,9 +127,9 @@ def test_an_empty_string_is_not_null_fails(self):
                 ""
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -140,9 +140,9 @@ def test_null_is_null_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+            body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -154,7 +154,7 @@ def test_null_is_null_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNullTypeMatchesOnlyTheNullObjectRequestBody',
+                self.configuration_.host + '/requestBody/postNullTypeMatchesOnlyTheNullObjectRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -172,9 +172,9 @@ def test_an_array_is_not_null_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -186,9 +186,9 @@ def test_a_string_is_not_null_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_oapg(
+                body = post.request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_number_type_matches_numbers_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_number_type_matches_numbers_request_body/test_post.py
index b676363568e..a9cda325cad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_number_type_matches_numbers_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_number_type_matches_numbers_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostNumberTypeMatchesNumbersRequestBody(ApiTestMixin, unitt
     """
     RequestBodyPostNumberTypeMatchesNumbersRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -43,9 +43,9 @@ def test_an_array_is_not_a_number_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -57,9 +57,9 @@ def test_null_is_not_a_number_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -72,9 +72,9 @@ def test_an_object_is_not_a_number_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -86,9 +86,9 @@ def test_a_boolean_is_not_a_number_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -99,9 +99,9 @@ def test_a_float_is_a_number_passes(self):
             payload = (
                 1.1
             )
-            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -113,7 +113,7 @@ def test_a_float_is_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
+                self.configuration_.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -130,9 +130,9 @@ def test_a_string_is_still_not_a_number_even_if_it_looks_like_one_fails(self):
                 "1"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -144,9 +144,9 @@ def test_a_string_is_not_a_number_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+                body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -157,9 +157,9 @@ def test_an_integer_is_a_number_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -171,7 +171,7 @@ def test_an_integer_is_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
+                self.configuration_.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -187,9 +187,9 @@ def test_a_float_with_zero_fractional_part_is_a_number_and_an_integer_passes(sel
             payload = (
                 1.0
             )
-            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_oapg(
+            body = post.request_body.number_type_matches_numbers.NumberTypeMatchesNumbers.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -201,7 +201,7 @@ def test_a_float_with_zero_fractional_part_is_a_number_and_an_integer_passes(sel
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
+                self.configuration_.host + '/requestBody/postNumberTypeMatchesNumbersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
index 827a71dde73..d4a5ccb0de4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_properties_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostObjectPropertiesValidationRequestBody(ApiTestMixin, uni
     """
     RequestBodyPostObjectPropertiesValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_ignores_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postObjectPropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_ignores_other_non_objects_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postObjectPropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -109,9 +109,9 @@ def test_one_property_invalid_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+                body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -127,9 +127,9 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
                         "baz",
                 }
             )
-            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -141,7 +141,7 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postObjectPropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -161,9 +161,9 @@ def test_doesn_t_invalidate_other_properties_passes(self):
                         ],
                 }
             )
-            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+            body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -175,7 +175,7 @@ def test_doesn_t_invalidate_other_properties_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postObjectPropertiesValidationRequestBody',
+                self.configuration_.host + '/requestBody/postObjectPropertiesValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -199,9 +199,9 @@ def test_both_properties_invalid_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_oapg(
+                body = post.request_body.object_properties_validation.ObjectPropertiesValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_type_matches_objects_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_type_matches_objects_request_body/test_post.py
index 519dd2e2810..3b95c8a8186 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_type_matches_objects_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_object_type_matches_objects_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostObjectTypeMatchesObjectsRequestBody(ApiTestMixin, unitt
     """
     RequestBodyPostObjectTypeMatchesObjectsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_a_float_is_not_an_object_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_null_is_not_an_object_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -71,9 +71,9 @@ def test_an_array_is_not_an_object_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_an_object_is_an_object_passes(self):
                 {
                 }
             )
-            body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+            body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_an_object_is_an_object_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postObjectTypeMatchesObjectsRequestBody',
+                self.configuration_.host + '/requestBody/postObjectTypeMatchesObjectsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -116,9 +116,9 @@ def test_a_string_is_not_an_object_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -130,9 +130,9 @@ def test_an_integer_is_not_an_object_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -144,9 +144,9 @@ def test_a_boolean_is_not_an_object_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_oapg(
+                body = post.request_body.object_type_matches_objects.ObjectTypeMatchesObjects.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_complex_types_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_complex_types_request_body/test_post.py
index 5cdb17f4d03..100cd34a90f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_complex_types_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_complex_types_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostOneofComplexTypesRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostOneofComplexTypesRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_first_oneof_valid_complex_passes(self):
                         2,
                 }
             )
-            body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_oapg(
+            body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_first_oneof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofComplexTypesRequestBody',
+                self.configuration_.host + '/requestBody/postOneofComplexTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -80,9 +80,9 @@ def test_neither_oneof_valid_complex_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_oapg(
+                body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -99,9 +99,9 @@ def test_both_oneof_valid_complex_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_oapg(
+                body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -115,9 +115,9 @@ def test_second_oneof_valid_complex_passes(self):
                         "baz",
                 }
             )
-            body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_oapg(
+            body = post.request_body.oneof_complex_types.OneofComplexTypes.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -129,7 +129,7 @@ def test_second_oneof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofComplexTypesRequestBody',
+                self.configuration_.host + '/requestBody/postOneofComplexTypesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_request_body/test_post.py
index 545f75b4d49..a9ecefd9ed3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostOneofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostOneofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_second_oneof_valid_passes(self):
             payload = (
                 2.5
             )
-            body = post.request_body.oneof.Oneof.from_openapi_data_oapg(
+            body = post.request_body.oneof.Oneof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_second_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofRequestBody',
+                self.configuration_.host + '/requestBody/postOneofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_both_oneof_valid_fails(self):
                 3
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof.Oneof.from_openapi_data_oapg(
+                body = post.request_body.oneof.Oneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -85,9 +85,9 @@ def test_first_oneof_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.oneof.Oneof.from_openapi_data_oapg(
+            body = post.request_body.oneof.Oneof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_first_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofRequestBody',
+                self.configuration_.host + '/requestBody/postOneofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -116,9 +116,9 @@ def test_neither_oneof_valid_fails(self):
                 1.5
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof.Oneof.from_openapi_data_oapg(
+                body = post.request_body.oneof.Oneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_base_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_base_schema_request_body/test_post.py
index 04399aade4f..a2e7374e8a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_base_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_base_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostOneofWithBaseSchemaRequestBody(ApiTestMixin, unittest.T
     """
     RequestBodyPostOneofWithBaseSchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_both_oneof_valid_fails(self):
                 "foo"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -56,9 +56,9 @@ def test_mismatch_base_schema_fails(self):
                 3
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_oapg(
+                body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -69,9 +69,9 @@ def test_one_oneof_valid_passes(self):
             payload = (
                 "foobar"
             )
-            body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_oapg(
+            body = post.request_body.oneof_with_base_schema.OneofWithBaseSchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -83,7 +83,7 @@ def test_one_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofWithBaseSchemaRequestBody',
+                self.configuration_.host + '/requestBody/postOneofWithBaseSchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_empty_schema_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_empty_schema_request_body/test_post.py
index 16ec42f740f..646021f1096 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_empty_schema_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_empty_schema_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostOneofWithEmptySchemaRequestBody(ApiTestMixin, unittest.
     """
     RequestBodyPostOneofWithEmptySchemaRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_both_valid_invalid_fails(self):
                 123
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_with_empty_schema.OneofWithEmptySchema.from_openapi_data_oapg(
+                body = post.request_body.oneof_with_empty_schema.OneofWithEmptySchema.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_one_valid_valid_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body.oneof_with_empty_schema.OneofWithEmptySchema.from_openapi_data_oapg(
+            body = post.request_body.oneof_with_empty_schema.OneofWithEmptySchema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_one_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofWithEmptySchemaRequestBody',
+                self.configuration_.host + '/requestBody/postOneofWithEmptySchemaRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_required_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_required_request_body/test_post.py
index bfa95656eef..cd80cd71b43 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_required_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_oneof_with_required_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostOneofWithRequiredRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostOneofWithRequiredRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -49,9 +49,9 @@ def test_both_valid_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_oapg(
+                body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -66,9 +66,9 @@ def test_both_invalid_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_oapg(
+                body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -84,9 +84,9 @@ def test_first_valid_valid_passes(self):
                         2,
                 }
             )
-            body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_oapg(
+            body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -98,7 +98,7 @@ def test_first_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofWithRequiredRequestBody',
+                self.configuration_.host + '/requestBody/postOneofWithRequiredRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -119,9 +119,9 @@ def test_second_valid_valid_passes(self):
                         3,
                 }
             )
-            body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_oapg(
+            body = post.request_body.oneof_with_required.OneofWithRequired.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -133,7 +133,7 @@ def test_second_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postOneofWithRequiredRequestBody',
+                self.configuration_.host + '/requestBody/postOneofWithRequiredRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_is_not_anchored_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_is_not_anchored_request_body/test_post.py
index 4dab72c543d..724849bdddd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_is_not_anchored_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_is_not_anchored_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostPatternIsNotAnchoredRequestBody(ApiTestMixin, unittest.
     """
     RequestBodyPostPatternIsNotAnchoredRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -41,9 +41,9 @@ def test_matches_a_substring_passes(self):
             payload = (
                 "xxaayy"
             )
-            body = post.request_body.pattern_is_not_anchored.PatternIsNotAnchored.from_openapi_data_oapg(
+            body = post.request_body.pattern_is_not_anchored.PatternIsNotAnchored.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -55,7 +55,7 @@ def test_matches_a_substring_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternIsNotAnchoredRequestBody',
+                self.configuration_.host + '/requestBody/postPatternIsNotAnchoredRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_validation_request_body/test_post.py
index bc356536739..fb4d0b6d34c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_pattern_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostPatternValidationRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostPatternValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_ignores_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -73,9 +73,9 @@ def test_ignores_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -87,7 +87,7 @@ def test_ignores_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -103,9 +103,9 @@ def test_ignores_null_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -117,7 +117,7 @@ def test_ignores_null_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -133,9 +133,9 @@ def test_ignores_floats_passes(self):
             payload = (
                 1.0
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -147,7 +147,7 @@ def test_ignores_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -164,9 +164,9 @@ def test_a_non_matching_pattern_is_invalid_fails(self):
                 "abc"
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+                body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -177,9 +177,9 @@ def test_ignores_booleans_passes(self):
             payload = (
                 True
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -191,7 +191,7 @@ def test_ignores_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -207,9 +207,9 @@ def test_a_matching_pattern_is_valid_passes(self):
             payload = (
                 "aaa"
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -221,7 +221,7 @@ def test_a_matching_pattern_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -237,9 +237,9 @@ def test_ignores_integers_passes(self):
             payload = (
                 123
             )
-            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_oapg(
+            body = post.request_body.pattern_validation.PatternValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -251,7 +251,7 @@ def test_ignores_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPatternValidationRequestBody',
+                self.configuration_.host + '/requestBody/postPatternValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_properties_with_escaped_characters_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_properties_with_escaped_characters_request_body/test_post.py
index 98f946db4a2..7fe63e66509 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_properties_with_escaped_characters_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_properties_with_escaped_characters_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostPropertiesWithEscapedCharactersRequestBody(ApiTestMixin
     """
     RequestBodyPostPropertiesWithEscapedCharactersRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,9 +54,9 @@ def test_object_with_all_numbers_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters.from_openapi_data_oapg(
+            body = post.request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -68,7 +68,7 @@ def test_object_with_all_numbers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPropertiesWithEscapedCharactersRequestBody',
+                self.configuration_.host + '/requestBody/postPropertiesWithEscapedCharactersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -98,9 +98,9 @@ def test_object_with_strings_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters.from_openapi_data_oapg(
+                body = post.request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_property_named_ref_that_is_not_a_reference_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_property_named_ref_that_is_not_a_reference_request_body/test_post.py
index b55344cb1bb..f9a644790ff 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_property_named_ref_that_is_not_a_reference_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_property_named_ref_that_is_not_a_reference_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostPropertyNamedRefThatIsNotAReferenceRequestBody(ApiTestM
     """
     RequestBodyPostPropertyNamedRefThatIsNotAReferenceRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_property_named_ref_valid_passes(self):
                         "a",
                 }
             )
-            body = post.request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference.from_openapi_data_oapg(
+            body = post.request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postPropertyNamedRefThatIsNotAReferenceRequestBody',
+                self.configuration_.host + '/requestBody/postPropertyNamedRefThatIsNotAReferenceRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference.from_openapi_data_oapg(
+                body = post.request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_additionalproperties_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_additionalproperties_request_body/test_post.py
index 846bc2230d1..af2ab0df1fc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_additionalproperties_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_additionalproperties_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInAdditionalpropertiesRequestBody(ApiTestMixin, unit
     """
     RequestBodyPostRefInAdditionalpropertiesRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -47,9 +47,9 @@ def test_property_named_ref_valid_passes(self):
                         },
                 }
             )
-            body = post.request_body.ref_in_additionalproperties.RefInAdditionalproperties.from_openapi_data_oapg(
+            body = post.request_body.ref_in_additionalproperties.RefInAdditionalproperties.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -61,7 +61,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInAdditionalpropertiesRequestBody',
+                self.configuration_.host + '/requestBody/postRefInAdditionalpropertiesRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -84,9 +84,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_additionalproperties.RefInAdditionalproperties.from_openapi_data_oapg(
+                body = post.request_body.ref_in_additionalproperties.RefInAdditionalproperties.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_allof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_allof_request_body/test_post.py
index c4c86593fba..1d1d60be7f6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_allof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_allof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInAllofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostRefInAllofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_property_named_ref_valid_passes(self):
                         "a",
                 }
             )
-            body = post.request_body.ref_in_allof.RefInAllof.from_openapi_data_oapg(
+            body = post.request_body.ref_in_allof.RefInAllof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInAllofRequestBody',
+                self.configuration_.host + '/requestBody/postRefInAllofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_allof.RefInAllof.from_openapi_data_oapg(
+                body = post.request_body.ref_in_allof.RefInAllof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_anyof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_anyof_request_body/test_post.py
index 40d7e3b903c..28f39792e0f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_anyof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_anyof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInAnyofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostRefInAnyofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_property_named_ref_valid_passes(self):
                         "a",
                 }
             )
-            body = post.request_body.ref_in_anyof.RefInAnyof.from_openapi_data_oapg(
+            body = post.request_body.ref_in_anyof.RefInAnyof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInAnyofRequestBody',
+                self.configuration_.host + '/requestBody/postRefInAnyofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_anyof.RefInAnyof.from_openapi_data_oapg(
+                body = post.request_body.ref_in_anyof.RefInAnyof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_items_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_items_request_body/test_post.py
index 9817487a8a8..030e729c898 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_items_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_items_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInItemsRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostRefInItemsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -46,9 +46,9 @@ def test_property_named_ref_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.ref_in_items.RefInItems.from_openapi_data_oapg(
+            body = post.request_body.ref_in_items.RefInItems.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -60,7 +60,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInItemsRequestBody',
+                self.configuration_.host + '/requestBody/postRefInItemsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -82,9 +82,9 @@ def test_property_named_ref_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_items.RefInItems.from_openapi_data_oapg(
+                body = post.request_body.ref_in_items.RefInItems.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_not_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_not_request_body/test_post.py
index aa8083e63d0..fd329d6fffb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_not_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_not_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInNotRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostRefInNotRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_property_named_ref_valid_passes(self):
                         2,
                 }
             )
-            body = post.request_body.ref_in_not.RefInNot.from_openapi_data_oapg(
+            body = post.request_body.ref_in_not.RefInNot.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInNotRequestBody',
+                self.configuration_.host + '/requestBody/postRefInNotRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_not.RefInNot.from_openapi_data_oapg(
+                body = post.request_body.ref_in_not.RefInNot.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_oneof_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_oneof_request_body/test_post.py
index 08a3926c656..b8798b9c6d6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_oneof_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_oneof_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInOneofRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostRefInOneofRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_property_named_ref_valid_passes(self):
                         "a",
                 }
             )
-            body = post.request_body.ref_in_oneof.RefInOneof.from_openapi_data_oapg(
+            body = post.request_body.ref_in_oneof.RefInOneof.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInOneofRequestBody',
+                self.configuration_.host + '/requestBody/postRefInOneofRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -78,9 +78,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_oneof.RefInOneof.from_openapi_data_oapg(
+                body = post.request_body.ref_in_oneof.RefInOneof.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_property_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_property_request_body/test_post.py
index 52daa87bd05..a36eaac5184 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_property_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_ref_in_property_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRefInPropertyRequestBody(ApiTestMixin, unittest.TestCas
     """
     RequestBodyPostRefInPropertyRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -47,9 +47,9 @@ def test_property_named_ref_valid_passes(self):
                         },
                 }
             )
-            body = post.request_body.ref_in_property.RefInProperty.from_openapi_data_oapg(
+            body = post.request_body.ref_in_property.RefInProperty.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -61,7 +61,7 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRefInPropertyRequestBody',
+                self.configuration_.host + '/requestBody/postRefInPropertyRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -84,9 +84,9 @@ def test_property_named_ref_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.ref_in_property.RefInProperty.from_openapi_data_oapg(
+                body = post.request_body.ref_in_property.RefInProperty.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_default_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_default_validation_request_body/test_post.py
index feba6576d6b..83db6885eb9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_default_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_default_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRequiredDefaultValidationRequestBody(ApiTestMixin, unit
     """
     RequestBodyPostRequiredDefaultValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_not_required_by_default_passes(self):
                 {
                 }
             )
-            body = post.request_body.required_default_validation.RequiredDefaultValidation.from_openapi_data_oapg(
+            body = post.request_body.required_default_validation.RequiredDefaultValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_not_required_by_default_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredDefaultValidationRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredDefaultValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_validation_request_body/test_post.py
index 145e9ebea8f..8f293b5fe0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRequiredValidationRequestBody(ApiTestMixin, unittest.Te
     """
     RequestBodyPostRequiredValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_ignores_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_oapg(
+            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredValidationRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -75,9 +75,9 @@ def test_present_required_property_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_oapg(
+            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -89,7 +89,7 @@ def test_present_required_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredValidationRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -105,9 +105,9 @@ def test_ignores_other_non_objects_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_oapg(
+            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -119,7 +119,7 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredValidationRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -135,9 +135,9 @@ def test_ignores_strings_passes(self):
             payload = (
                 ""
             )
-            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_oapg(
+            body = post.request_body.required_validation.RequiredValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -149,7 +149,7 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredValidationRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -169,9 +169,9 @@ def test_non_present_required_property_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.required_validation.RequiredValidation.from_openapi_data_oapg(
+                body = post.request_body.required_validation.RequiredValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_empty_array_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_empty_array_request_body/test_post.py
index 82e60add816..3f3b6d57918 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_empty_array_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_empty_array_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRequiredWithEmptyArrayRequestBody(ApiTestMixin, unittes
     """
     RequestBodyPostRequiredWithEmptyArrayRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_property_not_required_passes(self):
                 {
                 }
             )
-            body = post.request_body.required_with_empty_array.RequiredWithEmptyArray.from_openapi_data_oapg(
+            body = post.request_body.required_with_empty_array.RequiredWithEmptyArray.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_property_not_required_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredWithEmptyArrayRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredWithEmptyArrayRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_escaped_characters_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_escaped_characters_request_body/test_post.py
index a9c8405f5cc..72668e22e21 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_escaped_characters_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_required_with_escaped_characters_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostRequiredWithEscapedCharactersRequestBody(ApiTestMixin,
     """
     RequestBodyPostRequiredWithEscapedCharactersRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -47,9 +47,9 @@ def test_object_with_some_properties_missing_is_invalid_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.required_with_escaped_characters.RequiredWithEscapedCharacters.from_openapi_data_oapg(
+                body = post.request_body.required_with_escaped_characters.RequiredWithEscapedCharacters.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -73,9 +73,9 @@ def test_object_with_all_properties_present_is_valid_passes(self):
                         1,
                 }
             )
-            body = post.request_body.required_with_escaped_characters.RequiredWithEscapedCharacters.from_openapi_data_oapg(
+            body = post.request_body.required_with_escaped_characters.RequiredWithEscapedCharacters.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -87,7 +87,7 @@ def test_object_with_all_properties_present_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postRequiredWithEscapedCharactersRequestBody',
+                self.configuration_.host + '/requestBody/postRequiredWithEscapedCharactersRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_simple_enum_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_simple_enum_validation_request_body/test_post.py
index 5b686cfdfd0..c896c8865a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_simple_enum_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_simple_enum_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostSimpleEnumValidationRequestBody(ApiTestMixin, unittest.
     """
     RequestBodyPostSimpleEnumValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_something_else_is_invalid_fails(self):
                 4
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.simple_enum_validation.SimpleEnumValidation.from_openapi_data_oapg(
+                body = post.request_body.simple_enum_validation.SimpleEnumValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_one_of_the_enum_is_valid_passes(self):
             payload = (
                 1
             )
-            body = post.request_body.simple_enum_validation.SimpleEnumValidation.from_openapi_data_oapg(
+            body = post.request_body.simple_enum_validation.SimpleEnumValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_one_of_the_enum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postSimpleEnumValidationRequestBody',
+                self.configuration_.host + '/requestBody/postSimpleEnumValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_string_type_matches_strings_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_string_type_matches_strings_request_body/test_post.py
index 9cd745cbcef..438cd130f6f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_string_type_matches_strings_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_string_type_matches_strings_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostStringTypeMatchesStringsRequestBody(ApiTestMixin, unitt
     """
     RequestBodyPostStringTypeMatchesStringsRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_1_is_not_a_string_fails(self):
                 1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -55,9 +55,9 @@ def test_a_string_is_still_a_string_even_if_it_looks_like_a_number_passes(self):
             payload = (
                 "1"
             )
-            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -69,7 +69,7 @@ def test_a_string_is_still_a_string_even_if_it_looks_like_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
+                self.configuration_.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -85,9 +85,9 @@ def test_an_empty_string_is_still_a_string_passes(self):
             payload = (
                 ""
             )
-            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -99,7 +99,7 @@ def test_an_empty_string_is_still_a_string_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
+                self.configuration_.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -116,9 +116,9 @@ def test_a_float_is_not_a_string_fails(self):
                 1.1
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -131,9 +131,9 @@ def test_an_object_is_not_a_string_fails(self):
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -146,9 +146,9 @@ def test_an_array_is_not_a_string_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -160,9 +160,9 @@ def test_a_boolean_is_not_a_string_fails(self):
                 True
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -174,9 +174,9 @@ def test_null_is_not_a_string_fails(self):
                 None
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+                body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -187,9 +187,9 @@ def test_a_string_is_a_string_passes(self):
             payload = (
                 "foo"
             )
-            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_oapg(
+            body = post.request_body.string_type_matches_strings.StringTypeMatchesStrings.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -201,7 +201,7 @@ def test_a_string_is_a_string_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
+                self.configuration_.host + '/requestBody/postStringTypeMatchesStringsRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/test_post.py
index 82d1d7fc1a1..d4767c4842c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissin
     """
     RequestBodyPostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_missing_properties_are_not_filled_in_with_the_default_passes(self):
                 {
                 }
             )
-            body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+            body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_missing_properties_are_not_filled_in_with_the_default_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody',
+                self.configuration_.host + '/requestBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -75,9 +75,9 @@ def test_an_explicit_property_value_is_checked_against_maximum_passing_passes(se
                         1,
                 }
             )
-            body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+            body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -89,7 +89,7 @@ def test_an_explicit_property_value_is_checked_against_maximum_passing_passes(se
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody',
+                self.configuration_.host + '/requestBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -109,9 +109,9 @@ def test_an_explicit_property_value_is_checked_against_maximum_failing_fails(sel
                 }
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_oapg(
+                body = post.request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_false_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_false_validation_request_body/test_post.py
index f1fb278b564..494945fa36f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_false_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_false_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostUniqueitemsFalseValidationRequestBody(ApiTestMixin, uni
     """
     RequestBodyPostUniqueitemsFalseValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -44,9 +44,9 @@ def test_non_unique_array_of_integers_is_valid_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -58,7 +58,7 @@ def test_non_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -83,9 +83,9 @@ def test_unique_array_of_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -97,7 +97,7 @@ def test_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -134,9 +134,9 @@ def test_non_unique_array_of_nested_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -148,7 +148,7 @@ def test_non_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -173,9 +173,9 @@ def test_non_unique_array_of_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -187,7 +187,7 @@ def test_non_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -206,9 +206,9 @@ def test_1_and_true_are_unique_passes(self):
                     True,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -220,7 +220,7 @@ def test_1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -239,9 +239,9 @@ def test_unique_array_of_integers_is_valid_passes(self):
                     2,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -253,7 +253,7 @@ def test_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -276,9 +276,9 @@ def test_non_unique_array_of_arrays_is_valid_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -290,7 +290,7 @@ def test_non_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -310,9 +310,9 @@ def test_numbers_are_unique_if_mathematically_unequal_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -324,7 +324,7 @@ def test_numbers_are_unique_if_mathematically_unequal_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -343,9 +343,9 @@ def test_false_is_not_equal_to_zero_passes(self):
                     False,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -357,7 +357,7 @@ def test_false_is_not_equal_to_zero_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -394,9 +394,9 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -408,7 +408,7 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -427,9 +427,9 @@ def test_0_and_false_are_unique_passes(self):
                     False,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -441,7 +441,7 @@ def test_0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -464,9 +464,9 @@ def test_unique_array_of_arrays_is_valid_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -478,7 +478,7 @@ def test_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -497,9 +497,9 @@ def test_true_is_not_equal_to_one_passes(self):
                     True,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -511,7 +511,7 @@ def test_true_is_not_equal_to_one_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -538,9 +538,9 @@ def test_non_unique_heterogeneous_types_are_valid_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -552,7 +552,7 @@ def test_non_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -577,9 +577,9 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
                     1,
                 ]
             )
-            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_false_validation.UniqueitemsFalseValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -591,7 +591,7 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsFalseValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_validation_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_validation_request_body/test_post.py
index b9e659e4b90..2e25afdd1b3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_validation_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uniqueitems_validation_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostUniqueitemsValidationRequestBody(ApiTestMixin, unittest
     """
     RequestBodyPostUniqueitemsValidationRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -50,9 +50,9 @@ def test_unique_array_of_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -64,7 +64,7 @@ def test_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -89,9 +89,9 @@ def test_a_true_and_a1_are_unique_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -103,7 +103,7 @@ def test_a_true_and_a1_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -131,9 +131,9 @@ def test_non_unique_heterogeneous_types_are_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -157,9 +157,9 @@ def test_nested0_and_false_are_unique_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -171,7 +171,7 @@ def test_nested0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -196,9 +196,9 @@ def test_a_false_and_a0_are_unique_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -210,7 +210,7 @@ def test_a_false_and_a0_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -231,9 +231,9 @@ def test_numbers_are_unique_if_mathematically_unequal_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -247,9 +247,9 @@ def test_false_is_not_equal_to_zero_passes(self):
                     False,
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -261,7 +261,7 @@ def test_false_is_not_equal_to_zero_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -284,9 +284,9 @@ def test_0_and_false_are_unique_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -298,7 +298,7 @@ def test_0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -321,9 +321,9 @@ def test_unique_array_of_arrays_is_valid_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -335,7 +335,7 @@ def test_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -373,9 +373,9 @@ def test_non_unique_array_of_nested_objects_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -391,9 +391,9 @@ def test_non_unique_array_of_more_than_two_integers_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -407,9 +407,9 @@ def test_true_is_not_equal_to_one_passes(self):
                     True,
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -421,7 +421,7 @@ def test_true_is_not_equal_to_one_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -451,9 +451,9 @@ def test_objects_are_non_unique_despite_key_order_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -468,9 +468,9 @@ def test_unique_array_of_strings_is_valid_passes(self):
                     "baz",
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -482,7 +482,7 @@ def test_unique_array_of_strings_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -505,9 +505,9 @@ def test_1_and_true_are_unique_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -519,7 +519,7 @@ def test_1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -548,9 +548,9 @@ def test_different_objects_are_unique_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -562,7 +562,7 @@ def test_different_objects_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -581,9 +581,9 @@ def test_unique_array_of_integers_is_valid_passes(self):
                     2,
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -595,7 +595,7 @@ def test_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -622,9 +622,9 @@ def test_non_unique_array_of_more_than_two_arrays_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -645,9 +645,9 @@ def test_non_unique_array_of_objects_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -679,9 +679,9 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
                     },
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -693,7 +693,7 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -717,9 +717,9 @@ def test_non_unique_array_of_arrays_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -735,9 +735,9 @@ def test_non_unique_array_of_strings_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
@@ -761,9 +761,9 @@ def test_nested1_and_true_are_unique_passes(self):
                     ],
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -775,7 +775,7 @@ def test_nested1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -801,9 +801,9 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
                     "{}",
                 ]
             )
-            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+            body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -815,7 +815,7 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUniqueitemsValidationRequestBody',
+                self.configuration_.host + '/requestBody/postUniqueitemsValidationRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -835,9 +835,9 @@ def test_non_unique_array_of_integers_is_invalid_fails(self):
                 ]
             )
             with self.assertRaises((unit_test_api.ApiValueError, unit_test_api.ApiTypeError)):
-                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_oapg(
+                body = post.request_body.uniqueitems_validation.UniqueitemsValidation.from_openapi_data_(
                     payload,
-                    _configuration=self._configuration
+                    configuration_=self.configuration_
                 )
                 self.api.post(body=body)
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_format_request_body/test_post.py
index 99289ac005e..c5d90c35e3a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostUriFormatRequestBody(ApiTestMixin, unittest.TestCase):
     """
     RequestBodyPostUriFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.uri_format.UriFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_format.UriFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_reference_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_reference_format_request_body/test_post.py
index 72bbe374d27..cdca465a56d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_reference_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_reference_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostUriReferenceFormatRequestBody(ApiTestMixin, unittest.Te
     """
     RequestBodyPostUriReferenceFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_reference_format.UriReferenceFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriReferenceFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriReferenceFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_template_format_request_body/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_template_format_request_body/test_post.py
index baaacaae411..deffa836745 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_template_format_request_body/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_request_body_post_uri_template_format_request_body/test_post.py
@@ -22,10 +22,10 @@ class TestRequestBodyPostUriTemplateFormatRequestBody(ApiTestMixin, unittest.Tes
     """
     RequestBodyPostUriTemplateFormatRequestBody unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -42,9 +42,9 @@ def test_all_string_formats_ignore_objects_passes(self):
                 {
                 }
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -56,7 +56,7 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -72,9 +72,9 @@ def test_all_string_formats_ignore_booleans_passes(self):
             payload = (
                 False
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -86,7 +86,7 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -102,9 +102,9 @@ def test_all_string_formats_ignore_integers_passes(self):
             payload = (
                 12
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -116,7 +116,7 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -132,9 +132,9 @@ def test_all_string_formats_ignore_floats_passes(self):
             payload = (
                 13.7
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -146,7 +146,7 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -163,9 +163,9 @@ def test_all_string_formats_ignore_arrays_passes(self):
                 [
                 ]
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -177,7 +177,7 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
@@ -193,9 +193,9 @@ def test_all_string_formats_ignore_nulls_passes(self):
             payload = (
                 None
             )
-            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_oapg(
+            body = post.request_body.uri_template_format.UriTemplateFormat.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             mock_request.return_value = self.response(
                 self.json_bytes(self.response_body),
@@ -207,7 +207,7 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/requestBody/postUriTemplateFormatRequestBody',
+                self.configuration_.host + '/requestBody/postUriTemplateFormatRequestBody',
                 method='post'.upper(),
                 body=self.json_bytes(payload),
                 content_type=content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/test_post.py
index 359d6dee234..b3bc1c6b416 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateRe
     """
     ResponseBodyPostAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_no_additional_properties_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -92,7 +92,7 @@ def test_an_additional_invalid_property_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -122,16 +122,16 @@ def test_an_additional_valid_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/test_post.py
index 3dd18823ac0..8502d634380 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAdditionalpropertiesAreAllowedByDefaultResponseBodyFor
     """
     ResponseBodyPostAdditionalpropertiesAreAllowedByDefaultResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -58,16 +58,16 @@ def test_additional_properties_are_allowed_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesAreAllowedByDefaultResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesAreAllowedByDefaultResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/test_post.py
index 6b26fd11633..5a33d9a7025 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAdditionalpropertiesCanExistByItselfResponseBodyForCon
     """
     ResponseBodyPostAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -55,7 +55,7 @@ def test_an_additional_invalid_property_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -81,16 +81,16 @@ def test_an_additional_valid_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/test_post.py
index 69229a1befb..e9b76d85e9c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAdditionalpropertiesShouldNotLookInApplicatorsResponse
     """
     ResponseBodyPostAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -57,7 +57,7 @@ def test_properties_defined_in_allof_are_not_examined_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -85,16 +85,16 @@ def test_valid_test_case_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/test_post.py
index ac30414aa99..f64ffc881e8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofCombinedWithAnyofOneofResponseBodyForContentTypes
     """
     ResponseBodyPostAllofCombinedWithAnyofOneofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_allof_true_anyof_false_oneof_false_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_allof_false_anyof_false_oneof_true_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -100,7 +100,7 @@ def test_allof_false_anyof_true_oneof_true_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -124,7 +124,7 @@ def test_allof_true_anyof_true_oneof_false_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -147,16 +147,16 @@ def test_allof_true_anyof_true_oneof_true_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -178,7 +178,7 @@ def test_allof_true_anyof_false_oneof_true_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -202,7 +202,7 @@ def test_allof_false_anyof_true_oneof_false_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -226,7 +226,7 @@ def test_allof_false_anyof_false_oneof_false_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofCombinedWithAnyofOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_response_body_for_content_types/test_post.py
index daab176aa27..d7fdf945fcb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofResponseBodyForContentTypes(ApiTestMixin, unittes
     """
     ResponseBodyPostAllofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -56,16 +56,16 @@ def test_allof_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -90,7 +90,7 @@ def test_mismatch_first_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -117,7 +117,7 @@ def test_mismatch_second_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -146,7 +146,7 @@ def test_wrong_type_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_simple_types_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_simple_types_response_body_for_content_types/test_post.py
index 116024657ae..de5ec917990 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_simple_types_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_simple_types_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofSimpleTypesResponseBodyForContentTypes(ApiTestMix
     """
     ResponseBodyPostAllofSimpleTypesResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofSimpleTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofSimpleTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_mismatch_one_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofSimpleTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofSimpleTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_base_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_base_schema_response_body_for_content_types/test_post.py
index de7888e6e23..e41ff9971da 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_base_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_base_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofWithBaseSchemaResponseBodyForContentTypes(ApiTest
     """
     ResponseBodyPostAllofWithBaseSchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -58,16 +58,16 @@ def test_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -94,7 +94,7 @@ def test_mismatch_first_allof_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -123,7 +123,7 @@ def test_mismatch_base_schema_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -150,7 +150,7 @@ def test_mismatch_both_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -179,7 +179,7 @@ def test_mismatch_second_allof_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_one_empty_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_one_empty_schema_response_body_for_content_types/test_post.py
index cfd21a9f271..9b16bdb712a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_one_empty_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_one_empty_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofWithOneEmptySchemaResponseBodyForContentTypes(Api
     """
     ResponseBodyPostAllofWithOneEmptySchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_any_data_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithOneEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithOneEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/test_post.py
index 772b530956c..01242c3106e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofWithTheFirstEmptySchemaResponseBodyForContentType
     """
     ResponseBodyPostAllofWithTheFirstEmptySchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_string_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithTheFirstEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithTheFirstEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithTheFirstEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithTheFirstEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/test_post.py
index f595eb2f9c4..5d362a82d2f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofWithTheLastEmptySchemaResponseBodyForContentTypes
     """
     ResponseBodyPostAllofWithTheLastEmptySchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_string_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithTheLastEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithTheLastEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithTheLastEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithTheLastEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/test_post.py
index 46e47546374..396c71de4b3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAllofWithTwoEmptySchemasResponseBodyForContentTypes(Ap
     """
     ResponseBodyPostAllofWithTwoEmptySchemasResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_any_data_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAllofWithTwoEmptySchemasResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAllofWithTwoEmptySchemasResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_complex_types_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_complex_types_response_body_for_content_types/test_post.py
index 9934450f6e4..2ef6019985a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_complex_types_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_complex_types_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAnyofComplexTypesResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostAnyofComplexTypesResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_second_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -90,7 +90,7 @@ def test_neither_anyof_valid_complex_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -118,16 +118,16 @@ def test_both_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -151,16 +151,16 @@ def test_first_anyof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_response_body_for_content_types/test_post.py
index 248bc4f4db2..37e31470b6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAnyofResponseBodyForContentTypes(ApiTestMixin, unittes
     """
     ResponseBodyPostAnyofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_second_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_neither_anyof_valid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -105,16 +105,16 @@ def test_both_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -135,16 +135,16 @@ def test_first_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_base_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_base_schema_response_body_for_content_types/test_post.py
index 75990078f73..91f861c9cff 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_base_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_base_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAnyofWithBaseSchemaResponseBodyForContentTypes(ApiTest
     """
     ResponseBodyPostAnyofWithBaseSchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_one_anyof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_both_anyof_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -106,7 +106,7 @@ def test_mismatch_base_schema_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/test_post.py
index f104ebe7484..8d0694311fc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostAnyofWithOneEmptySchemaResponseBodyForContentTypes(Api
     """
     ResponseBodyPostAnyofWithOneEmptySchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_string_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofWithOneEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofWithOneEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -81,16 +81,16 @@ def test_number_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postAnyofWithOneEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postAnyofWithOneEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_array_type_matches_arrays_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_array_type_matches_arrays_response_body_for_content_types/test_post.py
index 7e1d571bf51..872041f41d4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_array_type_matches_arrays_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_array_type_matches_arrays_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostArrayTypeMatchesArraysResponseBodyForContentTypes(ApiT
     """
     ResponseBodyPostArrayTypeMatchesArraysResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_a_float_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_a_boolean_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -100,7 +100,7 @@ def test_null_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -125,7 +125,7 @@ def test_an_object_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -149,7 +149,7 @@ def test_a_string_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -173,16 +173,16 @@ def test_an_array_is_an_array_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -204,7 +204,7 @@ def test_an_integer_is_not_an_array_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postArrayTypeMatchesArraysResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_boolean_type_matches_booleans_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_boolean_type_matches_booleans_response_body_for_content_types/test_post.py
index 702673e5ab8..d23da690a61 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_boolean_type_matches_booleans_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_boolean_type_matches_booleans_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostBooleanTypeMatchesBooleansResponseBodyForContentTypes(
     """
     ResponseBodyPostBooleanTypeMatchesBooleansResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_an_empty_string_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_a_float_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -100,7 +100,7 @@ def test_null_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -124,7 +124,7 @@ def test_zero_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -149,7 +149,7 @@ def test_an_array_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -173,7 +173,7 @@ def test_a_string_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -196,16 +196,16 @@ def test_false_is_a_boolean_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -227,7 +227,7 @@ def test_an_integer_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -250,16 +250,16 @@ def test_true_is_a_boolean_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -282,7 +282,7 @@ def test_an_object_is_not_a_boolean_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBooleanTypeMatchesBooleansResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_int_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_int_response_body_for_content_types/test_post.py
index d14d7e629cd..e5cb5d840a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_int_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_int_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostByIntResponseBodyForContentTypes(ApiTestMixin, unittes
     """
     ResponseBodyPostByIntResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_int_by_int_fail_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByIntResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByIntResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_int_by_int_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByIntResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByIntResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -105,16 +105,16 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByIntResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByIntResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_number_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_number_response_body_for_content_types/test_post.py
index 03fa3ee8b97..f4e9dcd6789 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_number_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_number_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostByNumberResponseBodyForContentTypes(ApiTestMixin, unit
     """
     ResponseBodyPostByNumberResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_45_is_multiple_of15_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByNumberResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByNumberResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_35_is_not_multiple_of15_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByNumberResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByNumberResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -105,16 +105,16 @@ def test_zero_is_multiple_of_anything_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postByNumberResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postByNumberResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_small_number_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_small_number_response_body_for_content_types/test_post.py
index 8745c76d99f..3ac66a6bbb9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_small_number_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_by_small_number_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostBySmallNumberResponseBodyForContentTypes(ApiTestMixin,
     """
     ResponseBodyPostBySmallNumberResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_000751_is_not_multiple_of00001_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBySmallNumberResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBySmallNumberResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_00075_is_multiple_of00001_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postBySmallNumberResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postBySmallNumberResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_date_time_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_date_time_format_response_body_for_content_types/test_post.py
index 26f61f34218..e52512f7db8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_date_time_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_date_time_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostDateTimeFormatResponseBodyForContentTypes(ApiTestMixin
     """
     ResponseBodyPostDateTimeFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postDateTimeFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_email_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_email_format_response_body_for_content_types/test_post.py
index 3b844a0aab4..d66c2c80120 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_email_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_email_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEmailFormatResponseBodyForContentTypes(ApiTestMixin, u
     """
     ResponseBodyPostEmailFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEmailFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/test_post.py
index 1b8e1301e39..6846f4e4808 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumWith0DoesNotMatchFalseResponseBodyForContentTypes(
     """
     ResponseBodyPostEnumWith0DoesNotMatchFalseResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_integer_zero_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -81,16 +81,16 @@ def test_float_zero_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,7 +112,7 @@ def test_false_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith0DoesNotMatchFalseResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/test_post.py
index a20f893e244..5655ead6627 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumWith1DoesNotMatchTrueResponseBodyForContentTypes(A
     """
     ResponseBodyPostEnumWith1DoesNotMatchTrueResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_true_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_integer_one_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -105,16 +105,16 @@ def test_float_one_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWith1DoesNotMatchTrueResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_escaped_characters_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_escaped_characters_response_body_for_content_types/test_post.py
index b6296d026f7..483c13ad26f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_escaped_characters_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_escaped_characters_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumWithEscapedCharactersResponseBodyForContentTypes(A
     """
     ResponseBodyPostEnumWithEscapedCharactersResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_member2_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -81,16 +81,16 @@ def test_member1_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,7 +112,7 @@ def test_another_string_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/test_post.py
index 879238e0cb2..d296712207b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes(
     """
     ResponseBodyPostEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_false_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_float_zero_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -106,7 +106,7 @@ def test_integer_zero_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/test_post.py
index c6541674314..78f70bc39f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes(A
     """
     ResponseBodyPostEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_float_one_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_true_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -106,7 +106,7 @@ def test_integer_one_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enums_in_properties_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enums_in_properties_response_body_for_content_types/test_post.py
index a927eb16bdc..5467b3334c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enums_in_properties_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_enums_in_properties_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostEnumsInPropertiesResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostEnumsInPropertiesResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_missing_optional_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -90,7 +90,7 @@ def test_wrong_foo_value_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -118,16 +118,16 @@ def test_both_properties_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -154,7 +154,7 @@ def test_wrong_bar_value_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -179,7 +179,7 @@ def test_missing_all_properties_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -206,7 +206,7 @@ def test_missing_required_property_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postEnumsInPropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_forbidden_property_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_forbidden_property_response_body_for_content_types/test_post.py
index 3cdaae50bb3..e62befbbf8f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_forbidden_property_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_forbidden_property_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostForbiddenPropertyResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostForbiddenPropertyResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -57,7 +57,7 @@ def test_property_present_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postForbiddenPropertyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postForbiddenPropertyResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -85,16 +85,16 @@ def test_property_absent_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postForbiddenPropertyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postForbiddenPropertyResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_hostname_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_hostname_format_response_body_for_content_types/test_post.py
index 370805d0b5a..78b1e0c4d1a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_hostname_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_hostname_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostHostnameFormatResponseBodyForContentTypes(ApiTestMixin
     """
     ResponseBodyPostHostnameFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postHostnameFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_integer_type_matches_integers_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_integer_type_matches_integers_response_body_for_content_types/test_post.py
index 7ec42a6e2ab..120d8e3c624 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_integer_type_matches_integers_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_integer_type_matches_integers_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostIntegerTypeMatchesIntegersResponseBodyForContentTypes(
     """
     ResponseBodyPostIntegerTypeMatchesIntegersResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -53,7 +53,7 @@ def test_an_object_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -77,7 +77,7 @@ def test_a_string_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -101,7 +101,7 @@ def test_null_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -124,16 +124,16 @@ def test_a_float_with_zero_fractional_part_is_an_integer_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -155,7 +155,7 @@ def test_a_float_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -179,7 +179,7 @@ def test_a_boolean_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -202,16 +202,16 @@ def test_an_integer_is_an_integer_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -233,7 +233,7 @@ def test_a_string_is_still_not_an_integer_even_if_it_looks_like_one_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -258,7 +258,7 @@ def test_an_array_is_not_an_integer_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIntegerTypeMatchesIntegersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/test_post.py
index de4015edbad..afd1165974d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf
     """
     ResponseBodyPostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_always_invalid_but_naive_implementations_may_raise_an_overflow_error_fa
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_valid_integer_with_multipleof_float_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_string_value_for_default_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_string_value_for_default_response_body_for_content_types/test_post.py
index 57ea9a2c512..e34e5c5b435 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_string_value_for_default_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_invalid_string_value_for_default_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostInvalidStringValueForDefaultResponseBodyForContentType
     """
     ResponseBodyPostInvalidStringValueForDefaultResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_valid_when_property_is_specified_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postInvalidStringValueForDefaultResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postInvalidStringValueForDefaultResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -85,16 +85,16 @@ def test_still_valid_when_the_invalid_default_is_used_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postInvalidStringValueForDefaultResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postInvalidStringValueForDefaultResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv4_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv4_format_response_body_for_content_types/test_post.py
index 52bad328e2e..ff4ec39ad5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv4_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv4_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostIpv4FormatResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostIpv4FormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv4FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv6_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv6_format_response_body_for_content_types/test_post.py
index 2dd4424e3e2..2e4e2b9543b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv6_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ipv6_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostIpv6FormatResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostIpv6FormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postIpv6FormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_json_pointer_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_json_pointer_format_response_body_for_content_types/test_post.py
index caae7727329..9748bddda0c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_json_pointer_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_json_pointer_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostJsonPointerFormatResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostJsonPointerFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postJsonPointerFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_response_body_for_content_types/test_post.py
index 5436aa900ab..5e257b241e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaximumValidationResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostMaximumValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_below_the_maximum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -81,16 +81,16 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,7 +112,7 @@ def test_above_the_maximum_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -135,16 +135,16 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/test_post.py
index 198455e815d..30dfc528cf0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaximumValidationWithUnsignedIntegerResponseBodyForCon
     """
     ResponseBodyPostMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_below_the_maximum_is_invalid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_above_the_maximum_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -105,16 +105,16 @@ def test_boundary_point_integer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -135,16 +135,16 @@ def test_boundary_point_float_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxitems_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxitems_validation_response_body_for_content_types/test_post.py
index b8cb0561a40..0399daefa6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxitems_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxitems_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaxitemsValidationResponseBodyForContentTypes(ApiTestM
     """
     ResponseBodyPostMaxitemsValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -56,7 +56,7 @@ def test_too_long_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -79,16 +79,16 @@ def test_ignores_non_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -111,16 +111,16 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -144,16 +144,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxlength_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxlength_validation_response_body_for_content_types/test_post.py
index f15f42c998d..a92df39ec65 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxlength_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxlength_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaxlengthValidationResponseBodyForContentTypes(ApiTest
     """
     ResponseBodyPostMaxlengthValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_too_long_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_ignores_non_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -105,16 +105,16 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -135,16 +135,16 @@ def test_two_supplementary_unicode_code_points_is_long_enough_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -165,16 +165,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/test_post.py
index 6f950971e68..364e4a2564a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaxproperties0MeansTheObjectIsEmptyResponseBodyForCont
     """
     ResponseBodyPostMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_no_properties_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -86,7 +86,7 @@ def test_one_property_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties_validation_response_body_for_content_types/test_post.py
index 86e0757bf3a..2050c7fa4c7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_maxproperties_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMaxpropertiesValidationResponseBodyForContentTypes(Api
     """
     ResponseBodyPostMaxpropertiesValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -59,7 +59,7 @@ def test_too_long_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -86,16 +86,16 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -116,16 +116,16 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -146,16 +146,16 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -179,16 +179,16 @@ def test_shorter_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -214,16 +214,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMaxpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_response_body_for_content_types/test_post.py
index cfeba214bf7..c75210d480d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMinimumValidationResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostMinimumValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_below_the_minimum_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -105,16 +105,16 @@ def test_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -135,16 +135,16 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/test_post.py
index c9bf042e762..3005e012617 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMinimumValidationWithSignedIntegerResponseBodyForConte
     """
     ResponseBodyPostMinimumValidationWithSignedIntegerResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_boundary_point_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -81,16 +81,16 @@ def test_positive_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,7 +112,7 @@ def test_int_below_the_minimum_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -136,7 +136,7 @@ def test_float_below_the_minimum_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -159,16 +159,16 @@ def test_boundary_point_with_float_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -189,16 +189,16 @@ def test_negative_above_the_minimum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -219,16 +219,16 @@ def test_ignores_non_numbers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinimumValidationWithSignedIntegerResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minitems_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minitems_validation_response_body_for_content_types/test_post.py
index 7bf0e70d656..1e7bf0714f2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minitems_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minitems_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMinitemsValidationResponseBodyForContentTypes(ApiTestM
     """
     ResponseBodyPostMinitemsValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -53,7 +53,7 @@ def test_too_short_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,16 +76,16 @@ def test_ignores_non_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -109,16 +109,16 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -141,16 +141,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minlength_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minlength_validation_response_body_for_content_types/test_post.py
index 38f5e152d18..ca6653f77f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minlength_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minlength_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMinlengthValidationResponseBodyForContentTypes(ApiTest
     """
     ResponseBodyPostMinlengthValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_too_short_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_one_supplementary_unicode_code_point_is_not_long_enough_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -99,16 +99,16 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -129,16 +129,16 @@ def test_ignores_non_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -159,16 +159,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinlengthValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minproperties_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minproperties_validation_response_body_for_content_types/test_post.py
index 0f889e0ba31..5452bf5ab7d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minproperties_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_minproperties_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostMinpropertiesValidationResponseBodyForContentTypes(Api
     """
     ResponseBodyPostMinpropertiesValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -114,7 +114,7 @@ def test_too_short_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -137,16 +137,16 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -172,16 +172,16 @@ def test_longer_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -205,16 +205,16 @@ def test_exact_length_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postMinpropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/test_post.py
index db853269359..bab54412170 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNestedAllofToCheckValidationSemanticsResponseBodyForCo
     """
     ResponseBodyPostNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_anything_non_null_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/test_post.py
index 4c979b134c7..397b9882963 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNestedAnyofToCheckValidationSemanticsResponseBodyForCo
     """
     ResponseBodyPostNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_anything_non_null_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_items_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_items_response_body_for_content_types/test_post.py
index 3c570313096..b9a56d5c1cd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_items_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_items_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNestedItemsResponseBodyForContentTypes(ApiTestMixin, u
     """
     ResponseBodyPostNestedItemsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -80,16 +80,16 @@ def test_valid_nested_array_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -140,7 +140,7 @@ def test_nested_array_with_invalid_type_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -187,7 +187,7 @@ def test_not_deep_enough_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedItemsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/test_post.py
index 438f7fdeded..89e81cab1b4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNestedOneofToCheckValidationSemanticsResponseBodyForCo
     """
     ResponseBodyPostNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_anything_non_null_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_null_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_more_complex_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_more_complex_schema_response_body_for_content_types/test_post.py
index 208c6e7093a..072d6de1efc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_more_complex_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_more_complex_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNotMoreComplexSchemaResponseBodyForContentTypes(ApiTes
     """
     ResponseBodyPostNotMoreComplexSchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_other_match_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_mismatch_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -111,16 +111,16 @@ def test_match_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNotMoreComplexSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_response_body_for_content_types/test_post.py
index 2385cd33d2e..42c7d92c5f1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_not_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNotResponseBodyForContentTypes(ApiTestMixin, unittest.
     """
     ResponseBodyPostNotResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_allowed_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNotResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNotResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_disallowed_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNotResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNotResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nul_characters_in_strings_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nul_characters_in_strings_response_body_for_content_types/test_post.py
index 1df41f8d7c7..8110be75468 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nul_characters_in_strings_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_nul_characters_in_strings_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNulCharactersInStringsResponseBodyForContentTypes(ApiT
     """
     ResponseBodyPostNulCharactersInStringsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_match_string_with_nul_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNulCharactersInStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNulCharactersInStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_do_not_match_string_lacking_nul_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNulCharactersInStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNulCharactersInStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/test_post.py
index 838b94b8b96..cfac0c40a33 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNullTypeMatchesOnlyTheNullObjectResponseBodyForContent
     """
     ResponseBodyPostNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_a_float_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -77,7 +77,7 @@ def test_an_object_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -101,7 +101,7 @@ def test_false_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -125,7 +125,7 @@ def test_an_integer_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -149,7 +149,7 @@ def test_true_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -173,7 +173,7 @@ def test_zero_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -197,7 +197,7 @@ def test_an_empty_string_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -220,16 +220,16 @@ def test_null_is_null_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -252,7 +252,7 @@ def test_an_array_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -276,7 +276,7 @@ def test_a_string_is_not_null_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_number_type_matches_numbers_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_number_type_matches_numbers_response_body_for_content_types/test_post.py
index f0e321e0e4c..45e825ad25b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_number_type_matches_numbers_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_number_type_matches_numbers_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostNumberTypeMatchesNumbersResponseBodyForContentTypes(Ap
     """
     ResponseBodyPostNumberTypeMatchesNumbersResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -53,7 +53,7 @@ def test_an_array_is_not_a_number_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -77,7 +77,7 @@ def test_null_is_not_a_number_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -102,7 +102,7 @@ def test_an_object_is_not_a_number_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -126,7 +126,7 @@ def test_a_boolean_is_not_a_number_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -149,16 +149,16 @@ def test_a_float_is_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -180,7 +180,7 @@ def test_a_string_is_still_not_a_number_even_if_it_looks_like_one_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -204,7 +204,7 @@ def test_a_string_is_not_a_number_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -227,16 +227,16 @@ def test_an_integer_is_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -257,16 +257,16 @@ def test_a_float_with_zero_fractional_part_is_a_number_and_an_integer_passes(sel
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postNumberTypeMatchesNumbersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
index 4be01666389..56c3140a885 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_properties_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostObjectPropertiesValidationResponseBodyForContentTypes(
     """
     ResponseBodyPostObjectPropertiesValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -119,7 +119,7 @@ def test_one_property_invalid_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -147,16 +147,16 @@ def test_both_properties_present_and_valid_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -181,16 +181,16 @@ def test_doesn_t_invalidate_other_properties_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -219,7 +219,7 @@ def test_both_properties_invalid_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectPropertiesValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_type_matches_objects_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_type_matches_objects_response_body_for_content_types/test_post.py
index 3d20c20dd19..c7633c516a1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_type_matches_objects_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_object_type_matches_objects_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostObjectTypeMatchesObjectsResponseBodyForContentTypes(Ap
     """
     ResponseBodyPostObjectTypeMatchesObjectsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_a_float_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_null_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -101,7 +101,7 @@ def test_an_array_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -125,16 +125,16 @@ def test_an_object_is_an_object_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -156,7 +156,7 @@ def test_a_string_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -180,7 +180,7 @@ def test_an_integer_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -204,7 +204,7 @@ def test_a_boolean_is_not_an_object_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postObjectTypeMatchesObjectsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_complex_types_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_complex_types_response_body_for_content_types/test_post.py
index c8af54674e8..a643cc84081 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_complex_types_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_complex_types_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostOneofComplexTypesResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostOneofComplexTypesResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_first_oneof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -90,7 +90,7 @@ def test_neither_oneof_valid_complex_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -119,7 +119,7 @@ def test_both_oneof_valid_complex_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -145,16 +145,16 @@ def test_second_oneof_valid_complex_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofComplexTypesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_response_body_for_content_types/test_post.py
index 00fcade925e..d15ebf6c202 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostOneofResponseBodyForContentTypes(ApiTestMixin, unittes
     """
     ResponseBodyPostOneofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_second_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,7 +82,7 @@ def test_both_oneof_valid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -105,16 +105,16 @@ def test_first_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -136,7 +136,7 @@ def test_neither_oneof_valid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_base_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_base_schema_response_body_for_content_types/test_post.py
index 8f38c2bf37e..7e7f9c3f737 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_base_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_base_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostOneofWithBaseSchemaResponseBodyForContentTypes(ApiTest
     """
     ResponseBodyPostOneofWithBaseSchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_both_oneof_valid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -76,7 +76,7 @@ def test_mismatch_base_schema_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -99,16 +99,16 @@ def test_one_oneof_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithBaseSchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_empty_schema_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_empty_schema_response_body_for_content_types/test_post.py
index ae487ffbafc..3087651b994 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_empty_schema_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_empty_schema_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostOneofWithEmptySchemaResponseBodyForContentTypes(ApiTes
     """
     ResponseBodyPostOneofWithEmptySchemaResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_both_valid_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_one_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithEmptySchemaResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithEmptySchemaResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_required_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_required_response_body_for_content_types/test_post.py
index 76c185434d5..14c824b1cbe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_required_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_oneof_with_required_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostOneofWithRequiredResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostOneofWithRequiredResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -59,7 +59,7 @@ def test_both_valid_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -86,7 +86,7 @@ def test_both_invalid_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -114,16 +114,16 @@ def test_first_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -149,16 +149,16 @@ def test_second_valid_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postOneofWithRequiredResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_is_not_anchored_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_is_not_anchored_response_body_for_content_types/test_post.py
index 86afa293f6a..822f00105ab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_is_not_anchored_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_is_not_anchored_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostPatternIsNotAnchoredResponseBodyForContentTypes(ApiTes
     """
     ResponseBodyPostPatternIsNotAnchoredResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -51,16 +51,16 @@ def test_matches_a_substring_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternIsNotAnchoredResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternIsNotAnchoredResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_validation_response_body_for_content_types/test_post.py
index 6b68fea2877..c0623b7cd2a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_pattern_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostPatternValidationResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostPatternValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -83,16 +83,16 @@ def test_ignores_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -113,16 +113,16 @@ def test_ignores_null_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -143,16 +143,16 @@ def test_ignores_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -174,7 +174,7 @@ def test_a_non_matching_pattern_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -197,16 +197,16 @@ def test_ignores_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -227,16 +227,16 @@ def test_a_matching_pattern_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -257,16 +257,16 @@ def test_ignores_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPatternValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_properties_with_escaped_characters_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_properties_with_escaped_characters_response_body_for_content_types/test_post.py
index d18dc5b27b1..3c262c43022 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_properties_with_escaped_characters_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_properties_with_escaped_characters_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostPropertiesWithEscapedCharactersResponseBodyForContentT
     """
     ResponseBodyPostPropertiesWithEscapedCharactersResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -64,16 +64,16 @@ def test_object_with_all_numbers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPropertiesWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPropertiesWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -108,7 +108,7 @@ def test_object_with_strings_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPropertiesWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPropertiesWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/test_post.py
index 7e369545767..0e0d194127c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostPropertyNamedRefThatIsNotAReferenceResponseBodyForCont
     """
     ResponseBodyPostPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_additionalproperties_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_additionalproperties_response_body_for_content_types/test_post.py
index 75458f1873e..715ffbe795a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_additionalproperties_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_additionalproperties_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInAdditionalpropertiesResponseBodyForContentTypes(A
     """
     ResponseBodyPostRefInAdditionalpropertiesResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -57,16 +57,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAdditionalpropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAdditionalpropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -94,7 +94,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAdditionalpropertiesResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAdditionalpropertiesResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_allof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_allof_response_body_for_content_types/test_post.py
index 421cb90c9a9..507bc9c2feb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_allof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_allof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInAllofResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostRefInAllofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAllofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAllofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_anyof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_anyof_response_body_for_content_types/test_post.py
index 0cfbfce8488..d2e7813df27 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_anyof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_anyof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInAnyofResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostRefInAnyofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInAnyofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInAnyofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_items_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_items_response_body_for_content_types/test_post.py
index ed32fa68680..7f60ab60e3c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_items_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_items_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInItemsResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostRefInItemsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -56,16 +56,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInItemsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInItemsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -92,7 +92,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInItemsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInItemsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_not_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_not_response_body_for_content_types/test_post.py
index 5a991868343..9cac0c73f12 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_not_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_not_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInNotResponseBodyForContentTypes(ApiTestMixin, unit
     """
     ResponseBodyPostRefInNotResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInNotResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInNotResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInNotResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInNotResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_oneof_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_oneof_response_body_for_content_types/test_post.py
index 385233deffa..562f23d12e4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_oneof_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_oneof_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInOneofResponseBodyForContentTypes(ApiTestMixin, un
     """
     ResponseBodyPostRefInOneofResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -88,7 +88,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInOneofResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInOneofResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_property_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_property_response_body_for_content_types/test_post.py
index 2045fc99383..9d72b2e8250 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_property_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_ref_in_property_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRefInPropertyResponseBodyForContentTypes(ApiTestMixin,
     """
     ResponseBodyPostRefInPropertyResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -57,16 +57,16 @@ def test_property_named_ref_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInPropertyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInPropertyResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -94,7 +94,7 @@ def test_property_named_ref_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRefInPropertyResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRefInPropertyResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_default_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_default_validation_response_body_for_content_types/test_post.py
index 68a717ee42c..a83fcbe0673 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_default_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_default_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRequiredDefaultValidationResponseBodyForContentTypes(A
     """
     ResponseBodyPostRequiredDefaultValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_not_required_by_default_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredDefaultValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredDefaultValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_validation_response_body_for_content_types/test_post.py
index c983cdd9af7..21a29ade444 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRequiredValidationResponseBodyForContentTypes(ApiTestM
     """
     ResponseBodyPostRequiredValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_ignores_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -85,16 +85,16 @@ def test_present_required_property_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -115,16 +115,16 @@ def test_ignores_other_non_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -145,16 +145,16 @@ def test_ignores_strings_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -179,7 +179,7 @@ def test_non_present_required_property_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_empty_array_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_empty_array_response_body_for_content_types/test_post.py
index c19d895d0ac..62cc97140f9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_empty_array_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_empty_array_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRequiredWithEmptyArrayResponseBodyForContentTypes(ApiT
     """
     ResponseBodyPostRequiredWithEmptyArrayResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_property_not_required_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredWithEmptyArrayResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredWithEmptyArrayResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_escaped_characters_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_escaped_characters_response_body_for_content_types/test_post.py
index 109e822b6f8..adfabfaac8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_escaped_characters_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_required_with_escaped_characters_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostRequiredWithEscapedCharactersResponseBodyForContentTyp
     """
     ResponseBodyPostRequiredWithEscapedCharactersResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -57,7 +57,7 @@ def test_object_with_some_properties_missing_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -93,16 +93,16 @@ def test_object_with_all_properties_present_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postRequiredWithEscapedCharactersResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postRequiredWithEscapedCharactersResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_simple_enum_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_simple_enum_validation_response_body_for_content_types/test_post.py
index b3ca3fac21a..4ed695355ac 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_simple_enum_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_simple_enum_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostSimpleEnumValidationResponseBodyForContentTypes(ApiTes
     """
     ResponseBodyPostSimpleEnumValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_something_else_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postSimpleEnumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postSimpleEnumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_one_of_the_enum_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postSimpleEnumValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postSimpleEnumValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_string_type_matches_strings_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_string_type_matches_strings_response_body_for_content_types/test_post.py
index 6d0d5f988ab..be32d72dab7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_string_type_matches_strings_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_string_type_matches_strings_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostStringTypeMatchesStringsResponseBodyForContentTypes(Ap
     """
     ResponseBodyPostStringTypeMatchesStringsResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,7 +52,7 @@ def test_1_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -75,16 +75,16 @@ def test_a_string_is_still_a_string_even_if_it_looks_like_a_number_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -105,16 +105,16 @@ def test_an_empty_string_is_still_a_string_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -136,7 +136,7 @@ def test_a_float_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -161,7 +161,7 @@ def test_an_object_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -186,7 +186,7 @@ def test_an_array_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -210,7 +210,7 @@ def test_a_boolean_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -234,7 +234,7 @@ def test_null_is_not_a_string_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -257,16 +257,16 @@ def test_a_string_is_a_string_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postStringTypeMatchesStringsResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/test_post.py
index 581ad0eea4e..04f017939ea 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissi
     """
     ResponseBodyPostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_missing_properties_are_not_filled_in_with_the_default_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -85,16 +85,16 @@ def test_an_explicit_property_value_is_checked_against_maximum_passing_passes(se
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -119,7 +119,7 @@ def test_an_explicit_property_value_is_checked_against_maximum_failing_fails(sel
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_false_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_false_validation_response_body_for_content_types/test_post.py
index 71a76faca2a..4caf2521df2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_false_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_false_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostUniqueitemsFalseValidationResponseBodyForContentTypes(
     """
     ResponseBodyPostUniqueitemsFalseValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -54,16 +54,16 @@ def test_non_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -93,16 +93,16 @@ def test_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -144,16 +144,16 @@ def test_non_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -183,16 +183,16 @@ def test_non_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -216,16 +216,16 @@ def test_1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -249,16 +249,16 @@ def test_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -286,16 +286,16 @@ def test_non_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -320,16 +320,16 @@ def test_numbers_are_unique_if_mathematically_unequal_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -353,16 +353,16 @@ def test_false_is_not_equal_to_zero_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -404,16 +404,16 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -437,16 +437,16 @@ def test_0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -474,16 +474,16 @@ def test_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -507,16 +507,16 @@ def test_true_is_not_equal_to_one_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -548,16 +548,16 @@ def test_non_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -587,16 +587,16 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsFalseValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_validation_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_validation_response_body_for_content_types/test_post.py
index 92cbd258e69..ffdbdfefb71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_validation_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uniqueitems_validation_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostUniqueitemsValidationResponseBodyForContentTypes(ApiTe
     """
     ResponseBodyPostUniqueitemsValidationResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -60,16 +60,16 @@ def test_unique_array_of_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -99,16 +99,16 @@ def test_a_true_and_a1_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -141,7 +141,7 @@ def test_non_unique_heterogeneous_types_are_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -177,16 +177,16 @@ def test_nested0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -216,16 +216,16 @@ def test_a_false_and_a0_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -251,7 +251,7 @@ def test_numbers_are_unique_if_mathematically_unequal_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -277,16 +277,16 @@ def test_false_is_not_equal_to_zero_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -314,16 +314,16 @@ def test_0_and_false_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -351,16 +351,16 @@ def test_unique_array_of_arrays_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -403,7 +403,7 @@ def test_non_unique_array_of_nested_objects_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -431,7 +431,7 @@ def test_non_unique_array_of_more_than_two_integers_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -457,16 +457,16 @@ def test_true_is_not_equal_to_one_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -501,7 +501,7 @@ def test_objects_are_non_unique_despite_key_order_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -528,16 +528,16 @@ def test_unique_array_of_strings_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -565,16 +565,16 @@ def test_1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -608,16 +608,16 @@ def test_different_objects_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -641,16 +641,16 @@ def test_unique_array_of_integers_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -682,7 +682,7 @@ def test_non_unique_array_of_more_than_two_arrays_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -715,7 +715,7 @@ def test_non_unique_array_of_objects_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -759,16 +759,16 @@ def test_unique_array_of_nested_objects_is_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -797,7 +797,7 @@ def test_non_unique_array_of_arrays_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -825,7 +825,7 @@ def test_non_unique_array_of_strings_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
@@ -861,16 +861,16 @@ def test_nested1_and_true_are_unique_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -901,16 +901,16 @@ def test_unique_heterogeneous_types_are_valid_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -935,7 +935,7 @@ def test_non_unique_array_of_integers_is_invalid_fails(self):
                 )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUniqueitemsValidationResponseBodyForContentTypes',
                 method='post'.upper(),
                 content_type=None,
                 accept_content_type=accept_content_type,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_format_response_body_for_content_types/test_post.py
index 01d2ae341ce..bc318db600e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostUriFormatResponseBodyForContentTypes(ApiTestMixin, uni
     """
     ResponseBodyPostUriFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_reference_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_reference_format_response_body_for_content_types/test_post.py
index 2990204d696..a947eb4614e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_reference_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_reference_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostUriReferenceFormatResponseBodyForContentTypes(ApiTestM
     """
     ResponseBodyPostUriReferenceFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriReferenceFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_template_format_response_body_for_content_types/test_post.py b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_template_format_response_body_for_content_types/test_post.py
index 0d9041cbcb0..82de8b2d329 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_template_format_response_body_for_content_types/test_post.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/test/test_paths/test_response_body_post_uri_template_format_response_body_for_content_types/test_post.py
@@ -22,10 +22,10 @@ class TestResponseBodyPostUriTemplateFormatResponseBodyForContentTypes(ApiTestMi
     """
     ResponseBodyPostUriTemplateFormatResponseBodyForContentTypes unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
@@ -52,16 +52,16 @@ def test_all_string_formats_ignore_objects_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -82,16 +82,16 @@ def test_all_string_formats_ignore_booleans_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -112,16 +112,16 @@ def test_all_string_formats_ignore_integers_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -142,16 +142,16 @@ def test_all_string_formats_ignore_floats_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -173,16 +173,16 @@ def test_all_string_formats_ignore_arrays_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
@@ -203,16 +203,16 @@ def test_all_string_formats_ignore_nulls_passes(self):
             )
             self.assert_pool_manager_request_called_with(
                 mock_request,
-                self._configuration.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
+                self.configuration_.host + '/responseBody/postUriTemplateFormatResponseBodyForContentTypes',
                 method='post'.upper(),
                 accept_content_type=accept_content_type,
             )
 
             assert isinstance(api_response.response, urllib3.HTTPResponse)
             assert isinstance(api_response.body, self.response_body_schema)
-            deserialized_response_body = self.response_body_schema.from_openapi_data_oapg(
+            deserialized_response_body = self.response_body_schema.from_openapi_data_(
                 payload,
-                _configuration=self._configuration
+                configuration_=self.configuration_
             )
             assert api_response.body == deserialized_response_body
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/api_client.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/api_client.py
index 68e3486511f..0682e29e941 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/api_client.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/api_client.py
@@ -674,12 +674,12 @@ def deserialize(
             """
             if cls.style:
                 extracted_data = cls._deserialize_simple(in_data, name, cls.explode, False)
-                return schema.from_openapi_data_oapg(extracted_data)
+                return schema.from_openapi_data_(extracted_data)
         # cls.content will be length one
         for content_type, schema in cls.content.items():
             if cls._content_type_is_json(content_type):
                 cast_in_data = json.loads(in_data)
-                return schema.from_openapi_data_oapg(cast_in_data)
+                return schema.from_openapi_data_(cast_in_data)
             raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -757,7 +757,7 @@ class ApiResponseWithoutDeserialization(ApiResponse):
 
 class TypedDictInputVerifier:
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -894,7 +894,7 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
 
         deserialized_headers = schemas.unset
         if cls.headers is not None:
-            cls._verify_typed_dict_inputs_oapg(cls.response_cls.headers, response.headers)
+            cls._verify_typed_dict_inputs(cls.response_cls.headers, response.headers)
             deserialized_headers = {}
             for header_name, header_param in self.headers.items():
                 header_value = response.getheader(header_name)
@@ -927,8 +927,8 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
                 content_type = 'multipart/form-data'
             else:
                 raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
+            deserialized_body = body_schema.from_openapi_data_(
+                body_data, configuration_=configuration)
         elif streamed:
             response.release_conn()
 
@@ -1249,7 +1249,7 @@ def __init__(self, api_client: typing.Optional[ApiClient] = None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def _get_host_oapg(
+    def _get_host(
         self,
         operation_id: str,
         servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.py
index 21f1c2487d4..dede6d3bf67 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.py
@@ -33,20 +33,20 @@ class _Not(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         _Not = schemas.IntSchema
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_Not':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.pyi
index 21f1c2487d4..dede6d3bf67 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/_not.pyi
@@ -33,20 +33,20 @@ class _Not(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         _Not = schemas.IntSchema
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_Not':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.py
index 98543333cd5..2267ebefc0f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.py
@@ -33,7 +33,7 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -46,13 +46,13 @@ class Properties:
         AdditionalProperties = schemas.BoolSchema
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -66,15 +66,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -82,21 +82,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.pyi
index f977d045908..4ebc3ea9b34 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_allows_a_schema_which_should_validate.pyi
@@ -33,7 +33,7 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Foo = schemas.AnyTypeSchema
@@ -45,13 +45,13 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
         AdditionalProperties = schemas.BoolSchema
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -65,15 +65,15 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -81,21 +81,21 @@ class AdditionalpropertiesAllowsASchemaWhichShouldValidate(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesAllowsASchemaWhichShouldValidate':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py
index db1607ec605..022603b7f22 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.py
@@ -33,7 +33,7 @@ class AdditionalpropertiesAreAllowedByDefault(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,10 +46,10 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -66,15 +66,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -82,21 +82,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalpropertiesAreAllowedByDefault':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.pyi
index db1607ec605..022603b7f22 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_are_allowed_by_default.pyi
@@ -33,7 +33,7 @@ class AdditionalpropertiesAreAllowedByDefault(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,10 +46,10 @@ class AdditionalpropertiesAreAllowedByDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -66,15 +66,15 @@ class AdditionalpropertiesAreAllowedByDefault(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -82,21 +82,21 @@ class AdditionalpropertiesAreAllowedByDefault(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalpropertiesAreAllowedByDefault':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.py
index 979cbed68f1..1ba24a5cc6c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.py
@@ -33,26 +33,26 @@ class AdditionalpropertiesCanExistByItself(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         AdditionalProperties = schemas.BoolSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesCanExistByItself':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.pyi
index 7f6bd8a893b..fcde428c7cf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_can_exist_by_itself.pyi
@@ -33,25 +33,25 @@ class AdditionalpropertiesCanExistByItself(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         AdditionalProperties = schemas.BoolSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesCanExistByItself':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.py
index f232095fa18..7d13e50ae05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.py
@@ -33,7 +33,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         AdditionalProperties = schemas.BoolSchema
         
@@ -45,7 +45,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class Properties:
@@ -56,7 +56,7 @@ class Properties:
             
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -72,32 +72,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -105,22 +105,22 @@ def __new__(
             ]
 
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesShouldNotLookInApplicators':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.pyi
index f232095fa18..7d13e50ae05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/additionalproperties_should_not_look_in_applicators.pyi
@@ -33,7 +33,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         AdditionalProperties = schemas.BoolSchema
         
@@ -45,7 +45,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class Properties:
@@ -56,7 +56,7 @@ class AdditionalpropertiesShouldNotLookInApplicators(
             
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -72,32 +72,32 @@ class AdditionalpropertiesShouldNotLookInApplicators(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -105,22 +105,22 @@ class AdditionalpropertiesShouldNotLookInApplicators(
             ]
 
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'AdditionalpropertiesShouldNotLookInApplicators':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.py
index 1cfe58eba57..0d31b42a6c5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.py
@@ -33,7 +33,7 @@ class Allof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,7 +44,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class Properties:
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class Properties:
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Allof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.pyi
index 1cfe58eba57..0d31b42a6c5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof.pyi
@@ -33,7 +33,7 @@ class Allof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,7 +44,7 @@ class Allof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class Allof(
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ class Allof(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class Allof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class Allof(
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ class Allof(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ class Allof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Allof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.py
index 859b066a050..04dc7d88010 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.py
@@ -33,7 +33,7 @@ class AllofCombinedWithAnyofOneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,21 +44,21 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     multiple_of = 2
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,21 +73,21 @@ class OneOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     multiple_of = 5
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -102,21 +102,21 @@ class AnyOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     multiple_of = 3
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -126,13 +126,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofCombinedWithAnyofOneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.pyi
index 57e27f19b9e..4918076ce90 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_combined_with_anyof_oneof.pyi
@@ -33,7 +33,7 @@ class AllofCombinedWithAnyofOneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,20 +44,20 @@ class AllofCombinedWithAnyofOneof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -72,20 +72,20 @@ class AllofCombinedWithAnyofOneof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -100,20 +100,20 @@ class AllofCombinedWithAnyofOneof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -123,13 +123,13 @@ class AllofCombinedWithAnyofOneof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofCombinedWithAnyofOneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.py
index 49c126c2876..dbbcd4be98a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.py
@@ -33,7 +33,7 @@ class AllofSimpleTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,21 +44,21 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     inclusive_maximum = 30
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -68,21 +68,21 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     inclusive_minimum = 20
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -93,13 +93,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofSimpleTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.pyi
index 3cf0c70bda1..e3b90ca226b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_simple_types.pyi
@@ -33,7 +33,7 @@ class AllofSimpleTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,20 +44,20 @@ class AllofSimpleTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -67,20 +67,20 @@ class AllofSimpleTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -91,13 +91,13 @@ class AllofSimpleTypes(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofSimpleTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.py
index 081f1a5459a..5ea6f1761f8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.py
@@ -33,7 +33,7 @@ class AllofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "bar",
@@ -53,7 +53,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -66,10 +66,10 @@ class Properties:
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -85,32 +85,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -120,7 +120,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "baz",
@@ -133,10 +133,10 @@ class Properties:
                         }
             
                 
-                baz: MetaOapg.Properties.Baz
+                baz: Schema_.Properties.Baz
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+                def __getitem__(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -152,32 +152,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+                def get_item_(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["baz"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    baz: typing.Union[MetaOapg.Properties.Baz, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    baz: typing.Union[Schema_.Properties.Baz, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         baz=baz,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -186,10 +186,10 @@ def __new__(
             ]
 
     
-    bar: MetaOapg.Properties.Bar
+    bar: Schema_.Properties.Bar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -205,31 +205,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.pyi
index 081f1a5459a..5ea6f1761f8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_base_schema.pyi
@@ -33,7 +33,7 @@ class AllofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "bar",
@@ -53,7 +53,7 @@ class AllofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -66,10 +66,10 @@ class AllofWithBaseSchema(
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -85,32 +85,32 @@ class AllofWithBaseSchema(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -120,7 +120,7 @@ class AllofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "baz",
@@ -133,10 +133,10 @@ class AllofWithBaseSchema(
                         }
             
                 
-                baz: MetaOapg.Properties.Baz
+                baz: Schema_.Properties.Baz
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+                def __getitem__(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -152,32 +152,32 @@ class AllofWithBaseSchema(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+                def get_item_(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["baz"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    baz: typing.Union[MetaOapg.Properties.Baz, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    baz: typing.Union[Schema_.Properties.Baz, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         baz=baz,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -186,10 +186,10 @@ class AllofWithBaseSchema(
             ]
 
     
-    bar: MetaOapg.Properties.Bar
+    bar: Schema_.Properties.Bar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -205,31 +205,31 @@ class AllofWithBaseSchema(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.py
index ae8937951b9..1cadab8b3e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.py
@@ -33,7 +33,7 @@ class AllofWithOneEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -45,13 +45,13 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithOneEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.pyi
index ae8937951b9..1cadab8b3e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_one_empty_schema.pyi
@@ -33,7 +33,7 @@ class AllofWithOneEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -45,13 +45,13 @@ class AllofWithOneEmptySchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithOneEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.py
index 468afff993d..94dfff7a5a5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.py
@@ -33,7 +33,7 @@ class AllofWithTheFirstEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTheFirstEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.pyi
index 468afff993d..94dfff7a5a5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_first_empty_schema.pyi
@@ -33,7 +33,7 @@ class AllofWithTheFirstEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllofWithTheFirstEmptySchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTheFirstEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.py
index 07dc36b05a6..6a328a05dbd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.py
@@ -33,7 +33,7 @@ class AllofWithTheLastEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTheLastEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.pyi
index 07dc36b05a6..6a328a05dbd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_the_last_empty_schema.pyi
@@ -33,7 +33,7 @@ class AllofWithTheLastEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllofWithTheLastEmptySchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTheLastEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.py
index c703bc20349..7c1c62eec76 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.py
@@ -33,7 +33,7 @@ class AllofWithTwoEmptySchemas(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTwoEmptySchemas':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.pyi
index c703bc20349..7c1c62eec76 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/allof_with_two_empty_schemas.pyi
@@ -33,7 +33,7 @@ class AllofWithTwoEmptySchemas(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -47,13 +47,13 @@ class AllofWithTwoEmptySchemas(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AllofWithTwoEmptySchemas':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.py
index e2b53c11230..335f9b88b28 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.py
@@ -33,7 +33,7 @@ class Anyof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -45,21 +45,21 @@ class AnyOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     inclusive_minimum = 2
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -70,13 +70,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Anyof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.pyi
index b41ca2ec448..84839ef4b93 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof.pyi
@@ -33,7 +33,7 @@ class Anyof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -45,20 +45,20 @@ class Anyof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -69,13 +69,13 @@ class Anyof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Anyof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.py
index 3934f2204e0..048cf5bc65e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.py
@@ -33,7 +33,7 @@ class AnyofComplexTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -44,7 +44,7 @@ class AnyOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class Properties:
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class AnyOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class Properties:
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyofComplexTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.pyi
index 3934f2204e0..048cf5bc65e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_complex_types.pyi
@@ -33,7 +33,7 @@ class AnyofComplexTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -44,7 +44,7 @@ class AnyofComplexTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class AnyofComplexTypes(
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ class AnyofComplexTypes(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class AnyofComplexTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class AnyofComplexTypes(
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ class AnyofComplexTypes(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ class AnyofComplexTypes(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyofComplexTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.py
index 06a62653a38..080079a8cee 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.py
@@ -33,7 +33,7 @@ class AnyofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -46,21 +46,21 @@ class AnyOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     max_length = 2
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -70,21 +70,21 @@ class AnyOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     min_length = 4
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -95,11 +95,11 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AnyofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.pyi
index 8cf52b2a672..89e69ff77d9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_base_schema.pyi
@@ -33,7 +33,7 @@ class AnyofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -46,20 +46,20 @@ class AnyofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -69,20 +69,20 @@ class AnyofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -93,11 +93,11 @@ class AnyofWithBaseSchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AnyofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.py
index 8cce4eea864..3b6c6fcdaa8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.py
@@ -33,7 +33,7 @@ class AnyofWithOneEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -47,13 +47,13 @@ class AnyOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyofWithOneEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.pyi
index 8cce4eea864..3b6c6fcdaa8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/anyof_with_one_empty_schema.pyi
@@ -33,7 +33,7 @@ class AnyofWithOneEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -47,13 +47,13 @@ class AnyofWithOneEmptySchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyofWithOneEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.py
index 34cb91aecdf..85167b81ab0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.py
@@ -33,20 +33,20 @@ class ArrayTypeMatchesArrays(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayTypeMatchesArrays':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.pyi
index 34cb91aecdf..85167b81ab0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/array_type_matches_arrays.pyi
@@ -33,20 +33,20 @@ class ArrayTypeMatchesArrays(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayTypeMatchesArrays':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.py
index 94429ba4792..74fdf4f5966 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.py
@@ -33,20 +33,20 @@ class ByInt(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         multiple_of = 2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ByInt':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.pyi
index a42b3651c1f..40a4113319d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_int.pyi
@@ -33,19 +33,19 @@ class ByInt(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ByInt':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.py
index 294981e0521..b02dba5522c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.py
@@ -33,20 +33,20 @@ class ByNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         multiple_of = 1.5
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ByNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.pyi
index fc4bcf7b863..1e08a4b302c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_number.pyi
@@ -33,19 +33,19 @@ class ByNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ByNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.py
index bd7235a8608..8b0c980f9be 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.py
@@ -33,20 +33,20 @@ class BySmallNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         multiple_of = 0.00010
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'BySmallNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.pyi
index 9cef848d75e..eed453246d8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/by_small_number.pyi
@@ -33,19 +33,19 @@ class BySmallNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'BySmallNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.py
index 6d54dbb9119..2974e56c9d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.py
@@ -34,20 +34,20 @@ class DateTimeFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'date-time'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'DateTimeFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.pyi
index 6d54dbb9119..2974e56c9d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/date_time_format.pyi
@@ -34,20 +34,20 @@ class DateTimeFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'date-time'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'DateTimeFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.py
index 2f31058f10c..bdffe7a104f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.py
@@ -33,20 +33,20 @@ class EmailFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'email'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EmailFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.pyi
index 2f31058f10c..bdffe7a104f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/email_format.pyi
@@ -33,20 +33,20 @@ class EmailFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'email'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EmailFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with0_does_not_match_false.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with0_does_not_match_false.py
index 5acbbcada4f..78c448cb625 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with0_does_not_match_false.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with0_does_not_match_false.py
@@ -33,7 +33,7 @@ class EnumWith0DoesNotMatchFalse(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with1_does_not_match_true.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with1_does_not_match_true.py
index 9e2880276a1..8101b468197 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with1_does_not_match_true.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with1_does_not_match_true.py
@@ -33,7 +33,7 @@ class EnumWith1DoesNotMatchTrue(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_escaped_characters.py
index be96a4f5d1d..ae3e58dc8a8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_escaped_characters.py
@@ -33,7 +33,7 @@ class EnumWithEscapedCharacters(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_false_does_not_match0.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_false_does_not_match0.py
index 688d9b7ac07..4ac7ba9ab7a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_false_does_not_match0.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_false_does_not_match0.py
@@ -33,7 +33,7 @@ class EnumWithFalseDoesNotMatch0(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.BoolClass,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_true_does_not_match1.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_true_does_not_match1.py
index 68f8992c089..fb9551704c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_true_does_not_match1.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enum_with_true_does_not_match1.py
@@ -33,7 +33,7 @@ class EnumWithTrueDoesNotMatch1(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.BoolClass,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.py
index 1eb67d23c6b..e5eb0273deb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.py
@@ -33,7 +33,7 @@ class EnumsInProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "bar",
@@ -47,7 +47,7 @@ class Foo(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -65,7 +65,7 @@ class Bar(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -81,13 +81,13 @@ def BAR(cls):
                 "bar": Bar,
             }
     
-    bar: MetaOapg.Properties.Bar
+    bar: Schema_.Properties.Bar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -104,15 +104,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -120,21 +120,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, ],
+        foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumsInProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.pyi
index 345087dd38e..bd12ae41c2a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/enums_in_properties.pyi
@@ -33,7 +33,7 @@ class EnumsInProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "bar",
         }
@@ -62,13 +62,13 @@ class EnumsInProperties(
                 "bar": Bar,
             }
     
-    bar: MetaOapg.Properties.Bar
+    bar: Schema_.Properties.Bar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -85,15 +85,15 @@ class EnumsInProperties(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -101,21 +101,21 @@ class EnumsInProperties(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, ],
+        foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumsInProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.py
index 77eb36ab0cc..62eeb8f6a35 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.py
@@ -33,7 +33,7 @@ class ForbiddenProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ForbiddenProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.pyi
index 77eb36ab0cc..62eeb8f6a35 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/forbidden_property.pyi
@@ -33,7 +33,7 @@ class ForbiddenProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class ForbiddenProperty(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ class ForbiddenProperty(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ForbiddenProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.py
index c01e7367874..1989ef7afa5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.py
@@ -33,20 +33,20 @@ class HostnameFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'hostname'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HostnameFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.pyi
index c01e7367874..1989ef7afa5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/hostname_format.pyi
@@ -33,20 +33,20 @@ class HostnameFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'hostname'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HostnameFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
index cb5c462b72b..f0e406c3949 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
@@ -33,7 +33,7 @@ class InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.py
index 1255624f572..d23641c0d7c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.py
@@ -33,7 +33,7 @@ class InvalidStringValueForDefault(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class Bar(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -55,7 +55,7 @@ class MetaOapg:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,31 +71,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'InvalidStringValueForDefault':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.pyi
index 40570855b51..4fbcc8dda82 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/invalid_string_value_for_default.pyi
@@ -33,7 +33,7 @@ class InvalidStringValueForDefault(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -49,7 +49,7 @@ class InvalidStringValueForDefault(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,31 +65,31 @@ class InvalidStringValueForDefault(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'InvalidStringValueForDefault':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.py
index b817d1872ca..c73e4077f44 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.py
@@ -33,20 +33,20 @@ class Ipv4Format(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'ipv4'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Ipv4Format':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.pyi
index b817d1872ca..c73e4077f44 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv4_format.pyi
@@ -33,20 +33,20 @@ class Ipv4Format(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'ipv4'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Ipv4Format':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.py
index 564f2df79f5..9efe7a2d6d4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.py
@@ -33,20 +33,20 @@ class Ipv6Format(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'ipv6'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Ipv6Format':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.pyi
index 564f2df79f5..9efe7a2d6d4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ipv6_format.pyi
@@ -33,20 +33,20 @@ class Ipv6Format(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'ipv6'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Ipv6Format':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.py
index 9009dc8b90e..e396c36e5fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.py
@@ -33,20 +33,20 @@ class JsonPointerFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'json-pointer'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'JsonPointerFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.pyi
index 9009dc8b90e..e396c36e5fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/json_pointer_format.pyi
@@ -33,20 +33,20 @@ class JsonPointerFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'json-pointer'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'JsonPointerFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.py
index 35bee6ae0b6..576e76f56a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.py
@@ -33,20 +33,20 @@ class MaximumValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         inclusive_maximum = 3.0
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaximumValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.pyi
index 2fd7b658d93..9fed80111c3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation.pyi
@@ -33,19 +33,19 @@ class MaximumValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaximumValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.py
index d3025328b4d..9a7952af237 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.py
@@ -33,20 +33,20 @@ class MaximumValidationWithUnsignedInteger(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         inclusive_maximum = 300
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaximumValidationWithUnsignedInteger':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.pyi
index d672129addc..c20a781124c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maximum_validation_with_unsigned_integer.pyi
@@ -33,19 +33,19 @@ class MaximumValidationWithUnsignedInteger(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaximumValidationWithUnsignedInteger':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.py
index 72a34d34575..904da280b49 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.py
@@ -33,20 +33,20 @@ class MaxitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         max_items = 2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.pyi
index 387679ba237..3bbab54529a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxitems_validation.pyi
@@ -33,19 +33,19 @@ class MaxitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.py
index d64307668b0..57f2e4127c8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.py
@@ -33,20 +33,20 @@ class MaxlengthValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         max_length = 2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxlengthValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.pyi
index 73d0907261c..fe764c5f0f1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxlength_validation.pyi
@@ -33,19 +33,19 @@ class MaxlengthValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxlengthValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.py
index a5e24079d6f..0b2c74666a4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.py
@@ -33,20 +33,20 @@ class Maxproperties0MeansTheObjectIsEmpty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         max_properties = 0
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Maxproperties0MeansTheObjectIsEmpty':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.pyi
index d5419861905..0956603ba4f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties0_means_the_object_is_empty.pyi
@@ -33,19 +33,19 @@ class Maxproperties0MeansTheObjectIsEmpty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Maxproperties0MeansTheObjectIsEmpty':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.py
index cc75ac86edb..ac092f74d0a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.py
@@ -33,20 +33,20 @@ class MaxpropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         max_properties = 2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxpropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.pyi
index f1b6b59cd85..11ff572e5cb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/maxproperties_validation.pyi
@@ -33,19 +33,19 @@ class MaxpropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MaxpropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.py
index ccc7eba1848..d65dae52ba0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.py
@@ -33,20 +33,20 @@ class MinimumValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         inclusive_minimum = 1.1
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinimumValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.pyi
index 990cf282c29..0e74a104b6d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation.pyi
@@ -33,19 +33,19 @@ class MinimumValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinimumValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.py
index 5e3e6fbdd94..809ee74ffcf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.py
@@ -33,20 +33,20 @@ class MinimumValidationWithSignedInteger(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         inclusive_minimum = -2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinimumValidationWithSignedInteger':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.pyi
index cc85066b51e..8d487c2469d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minimum_validation_with_signed_integer.pyi
@@ -33,19 +33,19 @@ class MinimumValidationWithSignedInteger(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinimumValidationWithSignedInteger':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.py
index dc6c9cc9597..128d6db6e74 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.py
@@ -33,20 +33,20 @@ class MinitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         min_items = 1
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.pyi
index 04e74e479b6..8ade2129abe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minitems_validation.pyi
@@ -33,19 +33,19 @@ class MinitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.py
index b39e4d26c4b..0ad6b9ddf56 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.py
@@ -33,20 +33,20 @@ class MinlengthValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         min_length = 2
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinlengthValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.pyi
index bd33a934312..ae19f007811 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minlength_validation.pyi
@@ -33,19 +33,19 @@ class MinlengthValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinlengthValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.py
index 35c079a4df1..7e011730e11 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.py
@@ -33,20 +33,20 @@ class MinpropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         min_properties = 1
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinpropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.pyi
index 55369425841..fad756bd501 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/minproperties_validation.pyi
@@ -33,19 +33,19 @@ class MinpropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MinpropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.py
index e8ab913655d..42fff901825 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.py
@@ -33,7 +33,7 @@ class NestedAllofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,7 +44,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -56,14 +56,14 @@ class AllOf:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedAllofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.pyi
index e8ab913655d..42fff901825 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_allof_to_check_validation_semantics.pyi
@@ -33,7 +33,7 @@ class NestedAllofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -44,7 +44,7 @@ class NestedAllofToCheckValidationSemantics(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -56,14 +56,14 @@ class NestedAllofToCheckValidationSemantics(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ class NestedAllofToCheckValidationSemantics(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedAllofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.py
index 1c2f034f5b0..6d7128306a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.py
@@ -33,7 +33,7 @@ class NestedAnyofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -44,7 +44,7 @@ class AnyOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AnyOf:
@@ -56,14 +56,14 @@ class AnyOf:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedAnyofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.pyi
index 1c2f034f5b0..6d7128306a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_anyof_to_check_validation_semantics.pyi
@@ -33,7 +33,7 @@ class NestedAnyofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -44,7 +44,7 @@ class NestedAnyofToCheckValidationSemantics(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AnyOf:
@@ -56,14 +56,14 @@ class NestedAnyofToCheckValidationSemantics(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ class NestedAnyofToCheckValidationSemantics(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedAnyofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.py
index 16efee1c7b2..77c97f23090 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.py
@@ -33,7 +33,7 @@ class NestedItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -42,7 +42,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {tuple}
                 
                 
@@ -51,7 +51,7 @@ class Items(
                 ):
                 
                 
-                    class MetaOapg:
+                    class Schema_:
                         types = {tuple}
                         
                         
@@ -60,62 +60,62 @@ class Items(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {tuple}
                                 Items = schemas.NumberSchema
                         
                             def __new__(
                                 cls,
-                                _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                                arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             ) -> 'Items':
                                 return super().__new__(
                                     cls,
-                                    _arg,
-                                    _configuration=_configuration,
+                                    arg_,
+                                    configuration_=configuration_,
                                 )
                         
-                            def __getitem__(self, i: int) -> MetaOapg.Items:
+                            def __getitem__(self, i: int) -> Schema_.Items:
                                 return super().__getitem__(i)
                 
                     def __new__(
                         cls,
-                        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     ) -> 'Items':
                         return super().__new__(
                             cls,
-                            _arg,
-                            _configuration=_configuration,
+                            arg_,
+                            configuration_=configuration_,
                         )
                 
-                    def __getitem__(self, i: int) -> MetaOapg.Items:
+                    def __getitem__(self, i: int) -> Schema_.Items:
                         return super().__getitem__(i)
         
             def __new__(
                 cls,
-                _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
             ) -> 'Items':
                 return super().__new__(
                     cls,
-                    _arg,
-                    _configuration=_configuration,
+                    arg_,
+                    configuration_=configuration_,
                 )
         
-            def __getitem__(self, i: int) -> MetaOapg.Items:
+            def __getitem__(self, i: int) -> Schema_.Items:
                 return super().__getitem__(i)
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NestedItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.pyi
index 16efee1c7b2..77c97f23090 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_items.pyi
@@ -33,7 +33,7 @@ class NestedItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -42,7 +42,7 @@ class NestedItems(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {tuple}
                 
                 
@@ -51,7 +51,7 @@ class NestedItems(
                 ):
                 
                 
-                    class MetaOapg:
+                    class Schema_:
                         types = {tuple}
                         
                         
@@ -60,62 +60,62 @@ class NestedItems(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {tuple}
                                 Items = schemas.NumberSchema
                         
                             def __new__(
                                 cls,
-                                _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                                arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             ) -> 'Items':
                                 return super().__new__(
                                     cls,
-                                    _arg,
-                                    _configuration=_configuration,
+                                    arg_,
+                                    configuration_=configuration_,
                                 )
                         
-                            def __getitem__(self, i: int) -> MetaOapg.Items:
+                            def __getitem__(self, i: int) -> Schema_.Items:
                                 return super().__getitem__(i)
                 
                     def __new__(
                         cls,
-                        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     ) -> 'Items':
                         return super().__new__(
                             cls,
-                            _arg,
-                            _configuration=_configuration,
+                            arg_,
+                            configuration_=configuration_,
                         )
                 
-                    def __getitem__(self, i: int) -> MetaOapg.Items:
+                    def __getitem__(self, i: int) -> Schema_.Items:
                         return super().__getitem__(i)
         
             def __new__(
                 cls,
-                _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
             ) -> 'Items':
                 return super().__new__(
                     cls,
-                    _arg,
-                    _configuration=_configuration,
+                    arg_,
+                    configuration_=configuration_,
                 )
         
-            def __getitem__(self, i: int) -> MetaOapg.Items:
+            def __getitem__(self, i: int) -> Schema_.Items:
                 return super().__getitem__(i)
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NestedItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.py
index be49af1ad15..1eb3dca48ce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.py
@@ -33,7 +33,7 @@ class NestedOneofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -44,7 +44,7 @@ class OneOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class OneOf:
@@ -56,14 +56,14 @@ class OneOf:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedOneofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.pyi
index be49af1ad15..1eb3dca48ce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nested_oneof_to_check_validation_semantics.pyi
@@ -33,7 +33,7 @@ class NestedOneofToCheckValidationSemantics(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -44,7 +44,7 @@ class NestedOneofToCheckValidationSemantics(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class OneOf:
@@ -56,14 +56,14 @@ class NestedOneofToCheckValidationSemantics(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -73,13 +73,13 @@ class NestedOneofToCheckValidationSemantics(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NestedOneofToCheckValidationSemantics':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.py
index 8fe6a176bac..a0a45814a20 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.py
@@ -33,7 +33,7 @@ class NotMoreComplexSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         
@@ -42,7 +42,7 @@ class _Not(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {frozendict.frozendict}
                 
                 class Properties:
@@ -52,7 +52,7 @@ class Properties:
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -68,45 +68,45 @@ def __getitem__(
                 return super().__getitem__(name)
             
             @typing.overload
-            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+            def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
             
             @typing.overload
-            def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+            def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(
+            def get_item_(
                 self,
                 name: typing.Union[
                     typing_extensions.Literal["foo"],
                     str
                 ]
             ):
-                return super().get_item_oapg(name)
+                return super().get_item_(name)
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, ],
-                foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, ],
+                foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> '_Not':
                 return super().__new__(
                     cls,
-                    *_args,
+                    *args_,
                     foo=foo,
-                    _configuration=_configuration,
+                    configuration_=configuration_,
                     **kwargs,
                 )
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NotMoreComplexSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.pyi
index a82a219f578..332d3dc2e02 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/not_more_complex_schema.pyi
@@ -33,7 +33,7 @@ class NotMoreComplexSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         
@@ -42,7 +42,7 @@ class NotMoreComplexSchema(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 
                 class Properties:
                     Foo = schemas.StrSchema
@@ -51,7 +51,7 @@ class NotMoreComplexSchema(
                     }
             
             @typing.overload
-            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+            def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
             
             @typing.overload
             def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -67,45 +67,45 @@ class NotMoreComplexSchema(
                 return super().__getitem__(name)
             
             @typing.overload
-            def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+            def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
             
             @typing.overload
-            def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+            def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
             
-            def get_item_oapg(
+            def get_item_(
                 self,
                 name: typing.Union[
                     typing_extensions.Literal["foo"],
                     str
                 ]
             ):
-                return super().get_item_oapg(name)
+                return super().get_item_(name)
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, ],
-                foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, ],
+                foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> '_Not':
                 return super().__new__(
                     cls,
-                    *_args,
+                    *args_,
                     foo=foo,
-                    _configuration=_configuration,
+                    configuration_=configuration_,
                     **kwargs,
                 )
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NotMoreComplexSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nul_characters_in_strings.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nul_characters_in_strings.py
index aaa44bc5bb6..a43d59a5671 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nul_characters_in_strings.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/nul_characters_in_strings.py
@@ -33,7 +33,7 @@ class NulCharactersInStrings(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.py
index a7534961efb..89abb232f16 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.py
@@ -33,7 +33,7 @@ class ObjectPropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,10 +46,10 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -66,15 +66,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -82,21 +82,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectPropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.pyi
index a7534961efb..89abb232f16 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/object_properties_validation.pyi
@@ -33,7 +33,7 @@ class ObjectPropertiesValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,10 +46,10 @@ class ObjectPropertiesValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -66,15 +66,15 @@ class ObjectPropertiesValidation(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -82,21 +82,21 @@ class ObjectPropertiesValidation(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectPropertiesValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.py
index 31770037645..f221310eb66 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.py
@@ -33,7 +33,7 @@ class Oneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -45,21 +45,21 @@ class OneOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     inclusive_minimum = 2
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -70,13 +70,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Oneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.pyi
index f065c726ddc..b4a99bf8842 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof.pyi
@@ -33,7 +33,7 @@ class Oneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -45,20 +45,20 @@ class Oneof(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -69,13 +69,13 @@ class Oneof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Oneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.py
index ea9764e3dca..4ff0c5f9963 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.py
@@ -33,7 +33,7 @@ class OneofComplexTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -44,7 +44,7 @@ class OneOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class Properties:
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class OneOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class Properties:
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofComplexTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.pyi
index ea9764e3dca..4ff0c5f9963 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_complex_types.pyi
@@ -33,7 +33,7 @@ class OneofComplexTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -44,7 +44,7 @@ class OneofComplexTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -57,10 +57,10 @@ class OneofComplexTypes(
                         }
             
                 
-                bar: MetaOapg.Properties.Bar
+                bar: Schema_.Properties.Bar
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,32 +76,32 @@ class OneofComplexTypes(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    bar: typing.Union[MetaOapg.Properties.Bar, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    bar: typing.Union[Schema_.Properties.Bar, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -111,7 +111,7 @@ class OneofComplexTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "foo",
@@ -124,10 +124,10 @@ class OneofComplexTypes(
                         }
             
                 
-                foo: MetaOapg.Properties.Foo
+                foo: Schema_.Properties.Foo
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -143,32 +143,32 @@ class OneofComplexTypes(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["foo"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    foo: typing.Union[MetaOapg.Properties.Foo, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    foo: typing.Union[Schema_.Properties.Foo, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ class OneofComplexTypes(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofComplexTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.py
index cc54985b56d..1100a7e5df5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.py
@@ -33,7 +33,7 @@ class OneofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -46,21 +46,21 @@ class OneOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     min_length = 2
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -70,21 +70,21 @@ class OneOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     max_length = 4
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -95,11 +95,11 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'OneofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.pyi
index 5795d8e3b7b..abc59eec9ae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_base_schema.pyi
@@ -33,7 +33,7 @@ class OneofWithBaseSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -46,20 +46,20 @@ class OneofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -69,20 +69,20 @@ class OneofWithBaseSchema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -93,11 +93,11 @@ class OneofWithBaseSchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'OneofWithBaseSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.py
index d4fb4670a0e..6a89399e970 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.py
@@ -33,7 +33,7 @@ class OneofWithEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -47,13 +47,13 @@ class OneOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofWithEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.pyi
index d4fb4670a0e..6a89399e970 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_empty_schema.pyi
@@ -33,7 +33,7 @@ class OneofWithEmptySchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -47,13 +47,13 @@ class OneofWithEmptySchema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofWithEmptySchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.py
index 660f2954564..974b1929b0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.py
@@ -33,7 +33,7 @@ class OneofWithRequired(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -46,7 +46,7 @@ class OneOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -78,15 +78,15 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
@@ -94,22 +94,22 @@ def get_item_oapg(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     bar: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     foo: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -119,7 +119,7 @@ class OneOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "baz",
@@ -151,15 +151,15 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["baz"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["baz"],
@@ -167,22 +167,22 @@ def get_item_oapg(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     baz: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     foo: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         baz=baz,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -193,13 +193,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofWithRequired':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.pyi
index 660f2954564..974b1929b0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/oneof_with_required.pyi
@@ -33,7 +33,7 @@ class OneofWithRequired(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -46,7 +46,7 @@ class OneofWithRequired(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "bar",
@@ -78,15 +78,15 @@ class OneofWithRequired(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["bar"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["bar"],
@@ -94,22 +94,22 @@ class OneofWithRequired(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     bar: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     foo: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf0':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         bar=bar,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -119,7 +119,7 @@ class OneofWithRequired(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     required = {
                         "baz",
@@ -151,15 +151,15 @@ class OneofWithRequired(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["baz"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["foo"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["baz"],
@@ -167,22 +167,22 @@ class OneofWithRequired(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     baz: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                     foo: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         baz=baz,
                         foo=foo,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -193,13 +193,13 @@ class OneofWithRequired(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'OneofWithRequired':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.py
index 2d79aff606a..b3ade207a80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.py
@@ -33,7 +33,7 @@ class PatternIsNotAnchored(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         regex={
             'pattern': r'a+',  # noqa: E501
@@ -42,13 +42,13 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PatternIsNotAnchored':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.pyi
index 1bf851858bc..930b701647c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_is_not_anchored.pyi
@@ -33,19 +33,19 @@ class PatternIsNotAnchored(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PatternIsNotAnchored':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.py
index a6e4ee132d6..da9413fd499 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.py
@@ -33,7 +33,7 @@ class PatternValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         regex={
             'pattern': r'^a*$',  # noqa: E501
@@ -42,13 +42,13 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PatternValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.pyi
index 496e4a106bf..2720070a1db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/pattern_validation.pyi
@@ -33,19 +33,19 @@ class PatternValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PatternValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.py
index 0f5aac527de..e8b7ca50de5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.py
@@ -33,7 +33,7 @@ class PropertiesWithEscapedCharacters(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -54,22 +54,22 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> MetaOapg.Properties.FooNbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> Schema_.Properties.FooNbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> MetaOapg.Properties.FooBar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> Schema_.Properties.FooBar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> MetaOapg.Properties.FooBar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> Schema_.Properties.FooBar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> MetaOapg.Properties.FooRbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> Schema_.Properties.FooRbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> MetaOapg.Properties.FooTbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> Schema_.Properties.FooTbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> MetaOapg.Properties.FooFbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> Schema_.Properties.FooFbar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -90,27 +90,27 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[MetaOapg.Properties.FooNbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[Schema_.Properties.FooNbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[MetaOapg.Properties.FooBar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[Schema_.Properties.FooBar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[MetaOapg.Properties.FooBar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[Schema_.Properties.FooBar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[MetaOapg.Properties.FooRbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[Schema_.Properties.FooRbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[MetaOapg.Properties.FooTbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[Schema_.Properties.FooTbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[MetaOapg.Properties.FooFbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[Schema_.Properties.FooFbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo\nbar"],
@@ -122,17 +122,17 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PropertiesWithEscapedCharacters':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.pyi
index 0f5aac527de..e8b7ca50de5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/properties_with_escaped_characters.pyi
@@ -33,7 +33,7 @@ class PropertiesWithEscapedCharacters(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -54,22 +54,22 @@ class PropertiesWithEscapedCharacters(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> MetaOapg.Properties.FooNbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\nbar"]) -> Schema_.Properties.FooNbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> MetaOapg.Properties.FooBar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\"bar"]) -> Schema_.Properties.FooBar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> MetaOapg.Properties.FooBar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\\bar"]) -> Schema_.Properties.FooBar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> MetaOapg.Properties.FooRbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\rbar"]) -> Schema_.Properties.FooRbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> MetaOapg.Properties.FooTbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\tbar"]) -> Schema_.Properties.FooTbar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> MetaOapg.Properties.FooFbar: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo\fbar"]) -> Schema_.Properties.FooFbar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -90,27 +90,27 @@ class PropertiesWithEscapedCharacters(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[MetaOapg.Properties.FooNbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\nbar"]) -> typing.Union[Schema_.Properties.FooNbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[MetaOapg.Properties.FooBar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\"bar"]) -> typing.Union[Schema_.Properties.FooBar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[MetaOapg.Properties.FooBar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\\bar"]) -> typing.Union[Schema_.Properties.FooBar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[MetaOapg.Properties.FooRbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\rbar"]) -> typing.Union[Schema_.Properties.FooRbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[MetaOapg.Properties.FooTbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\tbar"]) -> typing.Union[Schema_.Properties.FooTbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[MetaOapg.Properties.FooFbar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\fbar"]) -> typing.Union[Schema_.Properties.FooFbar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo\nbar"],
@@ -122,17 +122,17 @@ class PropertiesWithEscapedCharacters(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PropertiesWithEscapedCharacters':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.py
index 26b0d29e3d6..c73d2dddc03 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.py
@@ -33,7 +33,7 @@ class PropertyNamedRefThatIsNotAReference(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> MetaOapg.Properties.Ref: ...
+    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> Schema_.Properties.Ref: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,29 +60,29 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[MetaOapg.Properties.Ref, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[Schema_.Properties.Ref, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["$ref"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PropertyNamedRefThatIsNotAReference':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.pyi
index 26b0d29e3d6..c73d2dddc03 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/property_named_ref_that_is_not_a_reference.pyi
@@ -33,7 +33,7 @@ class PropertyNamedRefThatIsNotAReference(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class PropertyNamedRefThatIsNotAReference(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> MetaOapg.Properties.Ref: ...
+    def __getitem__(self, name: typing_extensions.Literal["$ref"]) -> Schema_.Properties.Ref: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,29 +60,29 @@ class PropertyNamedRefThatIsNotAReference(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[MetaOapg.Properties.Ref, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["$ref"]) -> typing.Union[Schema_.Properties.Ref, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["$ref"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'PropertyNamedRefThatIsNotAReference':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.py
index 5dd69c16f05..478fb4c972d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.py
@@ -33,7 +33,7 @@ class RefInAdditionalproperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         @staticmethod
@@ -44,19 +44,19 @@ def __getitem__(self, name: str) -> 'property_named_ref_that_is_not_a_reference.
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference',
     ) -> 'RefInAdditionalproperties':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.pyi
index 37e82ea07fa..9ea0253d776 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_additionalproperties.pyi
@@ -33,7 +33,7 @@ class RefInAdditionalproperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         @staticmethod
         def additional_properties() -> typing.Type['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference']:
@@ -43,19 +43,19 @@ class RefInAdditionalproperties(
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference',
     ) -> 'RefInAdditionalproperties':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.py
index f4aa63e7a0e..4c6f7a2d734 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.py
@@ -33,7 +33,7 @@ class RefInAllof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,14 +48,14 @@ def all_of0() -> typing.Type['property_named_ref_that_is_not_a_reference.Propert
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInAllof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.pyi
index f4aa63e7a0e..4c6f7a2d734 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_allof.pyi
@@ -33,7 +33,7 @@ class RefInAllof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,14 +48,14 @@ class RefInAllof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInAllof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.py
index 63fdd70a404..f16c3facf70 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.py
@@ -33,7 +33,7 @@ class RefInAnyof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -48,14 +48,14 @@ def any_of0() -> typing.Type['property_named_ref_that_is_not_a_reference.Propert
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInAnyof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.pyi
index 63fdd70a404..f16c3facf70 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_anyof.pyi
@@ -33,7 +33,7 @@ class RefInAnyof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -48,14 +48,14 @@ class RefInAnyof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInAnyof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.py
index 686ac9fb997..53d37484467 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.py
@@ -33,7 +33,7 @@ class RefInItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ def items() -> typing.Type['property_named_ref_that_is_not_a_reference.PropertyN
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference'], typing.List['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference'], typing.List['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'RefInItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.pyi
index 686ac9fb997..53d37484467 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_items.pyi
@@ -33,7 +33,7 @@ class RefInItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ class RefInItems(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference'], typing.List['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference'], typing.List['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'RefInItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference':
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.py
index 05c084218b5..f002f0ce0b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.py
@@ -33,7 +33,7 @@ class RefInNot(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -43,14 +43,14 @@ def _not() -> typing.Type['property_named_ref_that_is_not_a_reference.PropertyNa
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInNot':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.pyi
index 05c084218b5..f002f0ce0b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_not.pyi
@@ -33,7 +33,7 @@ class RefInNot(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -43,14 +43,14 @@ class RefInNot(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInNot':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.py
index a227ab116e7..38fe8c0e18a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.py
@@ -33,7 +33,7 @@ class RefInOneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -48,14 +48,14 @@ def one_of0() -> typing.Type['property_named_ref_that_is_not_a_reference.Propert
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInOneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.pyi
index a227ab116e7..38fe8c0e18a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_oneof.pyi
@@ -33,7 +33,7 @@ class RefInOneof(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -48,14 +48,14 @@ class RefInOneof(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInOneof':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.py
index 8e5b6005aa2..b5ffe744040 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.py
@@ -33,7 +33,7 @@ class RefInProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -63,32 +63,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
         a: typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.pyi
index 8e5b6005aa2..b5ffe744040 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/ref_in_property.pyi
@@ -33,7 +33,7 @@ class RefInProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -63,32 +63,32 @@ class RefInProperty(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
         a: typing.Union['property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RefInProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.py
index b46c1cd9821..295075e1790 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.py
@@ -33,7 +33,7 @@ class RequiredDefaultValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredDefaultValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.pyi
index b46c1cd9821..295075e1790 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_default_validation.pyi
@@ -33,7 +33,7 @@ class RequiredDefaultValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class RequiredDefaultValidation(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ class RequiredDefaultValidation(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredDefaultValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.py
index b7f8225f5c8..5a0f2708c74 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.py
@@ -33,7 +33,7 @@ class RequiredValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "foo",
@@ -48,13 +48,13 @@ class Properties:
             }
 
     
-    foo: MetaOapg.Properties.Foo
+    foo: Schema_.Properties.Foo
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,15 +71,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -87,21 +87,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.pyi
index b7f8225f5c8..5a0f2708c74 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_validation.pyi
@@ -33,7 +33,7 @@ class RequiredValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "foo",
@@ -48,13 +48,13 @@ class RequiredValidation(
             }
 
     
-    foo: MetaOapg.Properties.Foo
+    foo: Schema_.Properties.Foo
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,15 +71,15 @@ class RequiredValidation(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
@@ -87,21 +87,21 @@ class RequiredValidation(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        bar: typing.Union[Schema_.Properties.Bar, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredValidation':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.py
index a6ac5e9e00a..3986315dfde 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.py
@@ -33,7 +33,7 @@ class RequiredWithEmptyArray(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredWithEmptyArray':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.pyi
index a6ac5e9e00a..3986315dfde 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_empty_array.pyi
@@ -33,7 +33,7 @@ class RequiredWithEmptyArray(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -44,7 +44,7 @@ class RequiredWithEmptyArray(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ class RequiredWithEmptyArray(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        foo: typing.Union[MetaOapg.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        foo: typing.Union[Schema_.Properties.Foo, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredWithEmptyArray':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.py
index dc067ea3a0d..41c7210a146 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.py
@@ -33,7 +33,7 @@ class RequiredWithEscapedCharacters(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "foo\tbar",
@@ -83,27 +83,27 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\tbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\nbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\fbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\rbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\"bar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\\bar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo\tbar"],
@@ -115,17 +115,17 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredWithEscapedCharacters':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.pyi
index dc067ea3a0d..41c7210a146 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/required_with_escaped_characters.pyi
@@ -33,7 +33,7 @@ class RequiredWithEscapedCharacters(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "foo\tbar",
@@ -83,27 +83,27 @@ class RequiredWithEscapedCharacters(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\tbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\tbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\nbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\nbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\fbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\fbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\rbar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\rbar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\"bar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\"bar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo\\bar"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["foo\\bar"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["foo\tbar"],
@@ -115,17 +115,17 @@ class RequiredWithEscapedCharacters(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'RequiredWithEscapedCharacters':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/simple_enum_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/simple_enum_validation.py
index 90f6799e972..6d9adb74e33 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/simple_enum_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/simple_enum_validation.py
@@ -33,7 +33,7 @@ class SimpleEnumValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
index afebbfa1163..1d76e3dd54e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py
@@ -33,7 +33,7 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,7 +44,7 @@ class Alpha(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -54,7 +54,7 @@ class MetaOapg:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> MetaOapg.Properties.Alpha: ...
+    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> Schema_.Properties.Alpha: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -70,31 +70,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[MetaOapg.Properties.Alpha, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[Schema_.Properties.Alpha, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["alpha"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        alpha: typing.Union[MetaOapg.Properties.Alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        alpha: typing.Union[Schema_.Properties.Alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             alpha=alpha,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
index b3172735747..538b01965b2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.pyi
@@ -33,7 +33,7 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -47,7 +47,7 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> MetaOapg.Properties.Alpha: ...
+    def __getitem__(self, name: typing_extensions.Literal["alpha"]) -> Schema_.Properties.Alpha: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -63,31 +63,31 @@ class TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[MetaOapg.Properties.Alpha, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["alpha"]) -> typing.Union[Schema_.Properties.Alpha, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["alpha"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        alpha: typing.Union[MetaOapg.Properties.Alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        alpha: typing.Union[Schema_.Properties.Alpha, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             alpha=alpha,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.py
index 7afeb27050b..3bee0e2df1e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.py
@@ -33,20 +33,20 @@ class UniqueitemsFalseValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         unique_items = False
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UniqueitemsFalseValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.pyi
index 421089b8c2f..4775eeaf580 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_false_validation.pyi
@@ -33,19 +33,19 @@ class UniqueitemsFalseValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UniqueitemsFalseValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.py
index 9a4c99ab779..ff0b0aa2622 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.py
@@ -33,20 +33,20 @@ class UniqueitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         unique_items = True
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UniqueitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.pyi
index d061a8b935a..7e435831dbe 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uniqueitems_validation.pyi
@@ -33,19 +33,19 @@ class UniqueitemsValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UniqueitemsValidation':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.py
index a78c3e56cd9..e321b510596 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.py
@@ -33,20 +33,20 @@ class UriFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.pyi
index a78c3e56cd9..e321b510596 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_format.pyi
@@ -33,20 +33,20 @@ class UriFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.py
index 057006b6575..27fa8ff1c67 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.py
@@ -33,20 +33,20 @@ class UriReferenceFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri-reference'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriReferenceFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.pyi
index 057006b6575..27fa8ff1c67 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_reference_format.pyi
@@ -33,20 +33,20 @@ class UriReferenceFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri-reference'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriReferenceFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.py
index 56ce7d311c4..d64fa56b2c0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.py
@@ -33,20 +33,20 @@ class UriTemplateFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri-template'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriTemplateFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.pyi
index 56ce7d311c4..d64fa56b2c0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/components/schema/uri_template_format.pyi
@@ -33,20 +33,20 @@ class UriTemplateFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         format = 'uri-template'
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'UriTemplateFormat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.py
index 730e3bd41ce..a202e80d83f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_request_bod
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_request_bod
 
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_request_bod
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_request_bod
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_additionalproperties_allows_a_schema_which_should_validate_request_body
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.pyi
index 02062fd182d..486e211e1f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_allows_a_schema_which_should_validate_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_allows_a_schema_which_should_validate.AdditionalpropertiesAllowsASchemaWhichShouldValidate,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAdditionalpropertiesAllowsASchemaWhichShouldValidateRequestBody(BaseAp
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.py
index 82f82cd5c14..c4e9af61445 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
 
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_additionalproperties_are_allowed_by_default_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_request_body_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_request_body_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.pyi
index 93ea7151432..f5a5ea7f7c4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_are_allowed_by_default_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_are_allowed_by_default_request_body_oapg(
+    def _post_additionalproperties_are_allowed_by_default_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_are_allowed_by_default.AdditionalpropertiesAreAllowedByDefault,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAdditionalpropertiesAreAllowedByDefaultRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_request_body_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_request_body_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.py
index 6e6962e035f..d491764f6a8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
 
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_additionalproperties_can_exist_by_itself_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_request_body_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_request_body_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.pyi
index e971435d136..f86e1024158 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_can_exist_by_itself_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_can_exist_by_itself_request_body_oapg(
+    def _post_additionalproperties_can_exist_by_itself_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_can_exist_by_itself.AdditionalpropertiesCanExistByItself,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAdditionalpropertiesCanExistByItselfRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_request_body_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_request_body_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.py
index aa817b42ca7..3300dc8c304 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
 
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_additionalproperties_should_not_look_in_applicators_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.pyi
index 46820b2a55f..45adc7bb621 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_additionalproperties_should_not_look_in_applicators_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_request_body(
         self,
         body: typing.Union[request_body.additionalproperties_should_not_look_in_applicators.AdditionalpropertiesShouldNotLookInApplicators,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAdditionalpropertiesShouldNotLookInApplicatorsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_request_body_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.py
index ebc0341fc8d..88117676a89 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_combined_with_anyof_oneof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_combined_with_anyof_oneof_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_combined_with_anyof_oneof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_combined_with_anyof_oneof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_combined_with_anyof_oneof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_request_body_oapg(
+        return self._post_allof_combined_with_anyof_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_request_body_oapg(
+        return self._post_allof_combined_with_anyof_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.pyi
index 8f6631f5bd7..8f73dcd299b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_combined_with_anyof_oneof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_combined_with_anyof_oneof_request_body_oapg(
+    def _post_allof_combined_with_anyof_oneof_request_body(
         self,
         body: typing.Union[request_body.allof_combined_with_anyof_oneof.AllofCombinedWithAnyofOneof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofCombinedWithAnyofOneofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_request_body_oapg(
+        return self._post_allof_combined_with_anyof_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_request_body_oapg(
+        return self._post_allof_combined_with_anyof_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.py
index b5a7a0033c1..f940564df86 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_request_body_oapg(
+        return self._post_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_request_body_oapg(
+        return self._post_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.pyi
index 1213eeca113..7fcbc34627a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_request_body_oapg(
+    def _post_allof_request_body(
         self,
         body: typing.Union[request_body.allof.Allof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_request_body_oapg(
+        return self._post_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_request_body_oapg(
+        return self._post_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.py
index 818cd3d9304..596dc0c9491 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_simple_types_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_simple_types_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_simple_types_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_simple_types_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_simple_types_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_request_body_oapg(
+        return self._post_allof_simple_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_request_body_oapg(
+        return self._post_allof_simple_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.pyi
index c8d1153f1f0..b33e4e72ad8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_simple_types_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_simple_types_request_body_oapg(
+    def _post_allof_simple_types_request_body(
         self,
         body: typing.Union[request_body.allof_simple_types.AllofSimpleTypes,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofSimpleTypesRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_request_body_oapg(
+        return self._post_allof_simple_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_request_body_oapg(
+        return self._post_allof_simple_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.py
index fe9006fff21..6df376ef8bb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_with_base_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_with_base_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_with_base_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_with_base_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_with_base_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_request_body_oapg(
+        return self._post_allof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_request_body_oapg(
+        return self._post_allof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.pyi
index 8f5f032bf35..7f50fa51770 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_base_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_base_schema_request_body_oapg(
+    def _post_allof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_base_schema.AllofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofWithBaseSchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_request_body_oapg(
+        return self._post_allof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_request_body_oapg(
+        return self._post_allof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.py
index 5fef1e42d33..71e87246a73 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_with_one_empty_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_with_one_empty_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_with_one_empty_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_with_one_empty_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_with_one_empty_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_request_body_oapg(
+        return self._post_allof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_request_body_oapg(
+        return self._post_allof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.pyi
index 82f33fd3fc6..135c8d6a4d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_one_empty_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_one_empty_schema_request_body_oapg(
+    def _post_allof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_one_empty_schema.AllofWithOneEmptySchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofWithOneEmptySchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_request_body_oapg(
+        return self._post_allof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_request_body_oapg(
+        return self._post_allof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.py
index f7f9029360f..a3dac311a6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_with_the_first_empty_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_with_the_first_empty_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_with_the_first_empty_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_with_the_first_empty_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_with_the_first_empty_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_first_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_first_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.pyi
index 08acdd75d93..de77cdb111f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_first_empty_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_first_empty_schema_request_body_oapg(
+    def _post_allof_with_the_first_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_first_empty_schema.AllofWithTheFirstEmptySchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofWithTheFirstEmptySchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_first_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_first_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.py
index 165e320cac7..6c4c260fcaf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_with_the_last_empty_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_with_the_last_empty_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_with_the_last_empty_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_with_the_last_empty_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_with_the_last_empty_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_last_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_last_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.pyi
index 19a2cf7069d..dee8cdd4fda 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_the_last_empty_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_last_empty_schema_request_body_oapg(
+    def _post_allof_with_the_last_empty_schema_request_body(
         self,
         body: typing.Union[request_body.allof_with_the_last_empty_schema.AllofWithTheLastEmptySchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofWithTheLastEmptySchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_last_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_request_body_oapg(
+        return self._post_allof_with_the_last_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.py
index aa82d774ef9..a5ffda27028 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_allof_with_two_empty_schemas_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_allof_with_two_empty_schemas_request_body_oapg(
 
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_allof_with_two_empty_schemas_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_allof_with_two_empty_schemas_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_allof_with_two_empty_schemas_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_request_body_oapg(
+        return self._post_allof_with_two_empty_schemas_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_request_body_oapg(
+        return self._post_allof_with_two_empty_schemas_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.pyi
index 0e72a4d60ca..ace55a10109 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_allof_with_two_empty_schemas_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_two_empty_schemas_request_body_oapg(
+    def _post_allof_with_two_empty_schemas_request_body(
         self,
         body: typing.Union[request_body.allof_with_two_empty_schemas.AllofWithTwoEmptySchemas,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAllofWithTwoEmptySchemasRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_request_body_oapg(
+        return self._post_allof_with_two_empty_schemas_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_request_body_oapg(
+        return self._post_allof_with_two_empty_schemas_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.py
index 89b5b458578..78b9a8d0e96 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_anyof_complex_types_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_anyof_complex_types_request_body_oapg(
 
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_anyof_complex_types_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_anyof_complex_types_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_anyof_complex_types_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_request_body_oapg(
+        return self._post_anyof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_request_body_oapg(
+        return self._post_anyof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.pyi
index e5a684a4ee8..888b14f5110 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_complex_types_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_complex_types_request_body_oapg(
+    def _post_anyof_complex_types_request_body(
         self,
         body: typing.Union[request_body.anyof_complex_types.AnyofComplexTypes,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAnyofComplexTypesRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_request_body_oapg(
+        return self._post_anyof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_request_body_oapg(
+        return self._post_anyof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.py
index b1397a1c96f..f24f6105f25 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_anyof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_anyof_request_body_oapg(
 
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_anyof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_anyof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_anyof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_request_body_oapg(
+        return self._post_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_request_body_oapg(
+        return self._post_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.pyi
index 0b033ca2259..e78f5265131 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_request_body_oapg(
+    def _post_anyof_request_body(
         self,
         body: typing.Union[request_body.anyof.Anyof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAnyofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_request_body_oapg(
+        return self._post_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_request_body_oapg(
+        return self._post_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.py
index fce00ca549e..02a0495a6c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_anyof_with_base_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_anyof_with_base_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_anyof_with_base_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_anyof_with_base_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_anyof_with_base_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_request_body_oapg(
+        return self._post_anyof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_request_body_oapg(
+        return self._post_anyof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.pyi
index cb83cc394bc..a748bd76f0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_base_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_base_schema_request_body_oapg(
+    def _post_anyof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_base_schema.AnyofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAnyofWithBaseSchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_request_body_oapg(
+        return self._post_anyof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_request_body_oapg(
+        return self._post_anyof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.py
index 42964b186b7..4707b1a3e1a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_anyof_with_one_empty_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_anyof_with_one_empty_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_anyof_with_one_empty_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_anyof_with_one_empty_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_anyof_with_one_empty_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_request_body_oapg(
+        return self._post_anyof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_request_body_oapg(
+        return self._post_anyof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.pyi
index 0741df2a5d1..c3e745f3f74 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_anyof_with_one_empty_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_one_empty_schema_request_body_oapg(
+    def _post_anyof_with_one_empty_schema_request_body(
         self,
         body: typing.Union[request_body.anyof_with_one_empty_schema.AnyofWithOneEmptySchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostAnyofWithOneEmptySchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_request_body_oapg(
+        return self._post_anyof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_request_body_oapg(
+        return self._post_anyof_with_one_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.py
index 61c2822b767..d87b302248c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_array_type_matches_arrays_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_array_type_matches_arrays_request_body_oapg(
 
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_array_type_matches_arrays_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_array_type_matches_arrays_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_array_type_matches_arrays_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_request_body_oapg(
+        return self._post_array_type_matches_arrays_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_request_body_oapg(
+        return self._post_array_type_matches_arrays_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.pyi
index db79cfab6a5..1d59f67dd19 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_array_type_matches_arrays_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_array_type_matches_arrays_request_body_oapg(
+    def _post_array_type_matches_arrays_request_body(
         self,
         body: typing.Union[request_body.array_type_matches_arrays.ArrayTypeMatchesArrays,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostArrayTypeMatchesArraysRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_request_body_oapg(
+        return self._post_array_type_matches_arrays_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_request_body_oapg(
+        return self._post_array_type_matches_arrays_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.py
index c25e29eb92b..143911f7d11 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_boolean_type_matches_booleans_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_boolean_type_matches_booleans_request_body_oapg(
 
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_boolean_type_matches_booleans_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_boolean_type_matches_booleans_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_boolean_type_matches_booleans_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_request_body_oapg(
+        return self._post_boolean_type_matches_booleans_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_request_body_oapg(
+        return self._post_boolean_type_matches_booleans_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.pyi
index c048eb5de6d..d1f7412ad7f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_boolean_type_matches_booleans_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_boolean_type_matches_booleans_request_body_oapg(
+    def _post_boolean_type_matches_booleans_request_body(
         self,
         body: typing.Union[request_body.boolean_type_matches_booleans.BooleanTypeMatchesBooleans,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostBooleanTypeMatchesBooleansRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_request_body_oapg(
+        return self._post_boolean_type_matches_booleans_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_request_body_oapg(
+        return self._post_boolean_type_matches_booleans_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.py
index f8eaf52a1d1..19852ac488e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_by_int_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_by_int_request_body_oapg(
 
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_by_int_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_by_int_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_by_int_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_request_body_oapg(
+        return self._post_by_int_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_request_body_oapg(
+        return self._post_by_int_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.pyi
index 7fb2956b589..209359a0454 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_int_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_int_request_body_oapg(
+    def _post_by_int_request_body(
         self,
         body: typing.Union[request_body.by_int.ByInt,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostByIntRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_request_body_oapg(
+        return self._post_by_int_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_request_body_oapg(
+        return self._post_by_int_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.py
index 63fd89240ae..c93ca797d3c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_by_number_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_by_number_request_body_oapg(
 
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_by_number_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_by_number_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_by_number_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_request_body_oapg(
+        return self._post_by_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_request_body_oapg(
+        return self._post_by_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.pyi
index 312dad9bfef..079269547a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_number_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_number_request_body_oapg(
+    def _post_by_number_request_body(
         self,
         body: typing.Union[request_body.by_number.ByNumber,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostByNumberRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_request_body_oapg(
+        return self._post_by_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_request_body_oapg(
+        return self._post_by_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.py
index 735eb698c9d..ba8320997fb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_by_small_number_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_by_small_number_request_body_oapg(
 
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_by_small_number_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_by_small_number_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_by_small_number_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_request_body_oapg(
+        return self._post_by_small_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_request_body_oapg(
+        return self._post_by_small_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.pyi
index 3a28581d855..8c2ff704dba 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_by_small_number_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_small_number_request_body_oapg(
+    def _post_by_small_number_request_body(
         self,
         body: typing.Union[request_body.by_small_number.BySmallNumber,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostBySmallNumberRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_request_body_oapg(
+        return self._post_by_small_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_request_body_oapg(
+        return self._post_by_small_number_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.py
index 822ce2ad8da..76589881b71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_date_time_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_date_time_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_date_time_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_date_time_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_date_time_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_request_body_oapg(
+        return self._post_date_time_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_request_body_oapg(
+        return self._post_date_time_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.pyi
index 1565e6c33ad..87054be265f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_date_time_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_date_time_format_request_body_oapg(
+    def _post_date_time_format_request_body(
         self,
         body: typing.Union[request_body.date_time_format.DateTimeFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostDateTimeFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_request_body_oapg(
+        return self._post_date_time_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_request_body_oapg(
+        return self._post_date_time_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.py
index 503b78f5d7b..1eebd2385be 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_email_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_email_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_email_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_email_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_email_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_request_body_oapg(
+        return self._post_email_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_request_body_oapg(
+        return self._post_email_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.pyi
index d0a9a5c0339..6fcd35a014b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_email_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_email_format_request_body_oapg(
+    def _post_email_format_request_body(
         self,
         body: typing.Union[request_body.email_format.EmailFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEmailFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_request_body_oapg(
+        return self._post_email_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_request_body_oapg(
+        return self._post_email_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.py
index 9cc1fd4f550..1761334b019 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enum_with0_does_not_match_false_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enum_with0_does_not_match_false_request_body_oapg(
 
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enum_with0_does_not_match_false_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enum_with0_does_not_match_false_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enum_with0_does_not_match_false_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_request_body_oapg(
+        return self._post_enum_with0_does_not_match_false_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_request_body_oapg(
+        return self._post_enum_with0_does_not_match_false_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.pyi
index a6079fd86f9..7f76409b7b5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with0_does_not_match_false_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with0_does_not_match_false_request_body_oapg(
+    def _post_enum_with0_does_not_match_false_request_body(
         self,
         body: typing.Union[request_body.enum_with0_does_not_match_false.EnumWith0DoesNotMatchFalse,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumWith0DoesNotMatchFalseRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_request_body_oapg(
+        return self._post_enum_with0_does_not_match_false_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_request_body_oapg(
+        return self._post_enum_with0_does_not_match_false_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.py
index 498f8257696..12a4f406468 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enum_with1_does_not_match_true_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enum_with1_does_not_match_true_request_body_oapg(
 
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enum_with1_does_not_match_true_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enum_with1_does_not_match_true_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enum_with1_does_not_match_true_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_request_body_oapg(
+        return self._post_enum_with1_does_not_match_true_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_request_body_oapg(
+        return self._post_enum_with1_does_not_match_true_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.pyi
index 4cc5e8b40af..fe4297dcee0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with1_does_not_match_true_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with1_does_not_match_true_request_body_oapg(
+    def _post_enum_with1_does_not_match_true_request_body(
         self,
         body: typing.Union[request_body.enum_with1_does_not_match_true.EnumWith1DoesNotMatchTrue,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumWith1DoesNotMatchTrueRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_request_body_oapg(
+        return self._post_enum_with1_does_not_match_true_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_request_body_oapg(
+        return self._post_enum_with1_does_not_match_true_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.py
index 3eab60e014e..5e72069a369 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enum_with_escaped_characters_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enum_with_escaped_characters_request_body_oapg(
 
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enum_with_escaped_characters_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enum_with_escaped_characters_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enum_with_escaped_characters_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_request_body_oapg(
+        return self._post_enum_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_request_body_oapg(
+        return self._post_enum_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.pyi
index 269f804d003..9f101d81e76 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_escaped_characters_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_escaped_characters_request_body_oapg(
+    def _post_enum_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.enum_with_escaped_characters.EnumWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumWithEscapedCharactersRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_request_body_oapg(
+        return self._post_enum_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_request_body_oapg(
+        return self._post_enum_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.py
index 59dc71775a3..93f06d94946 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enum_with_false_does_not_match0_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enum_with_false_does_not_match0_request_body_oapg(
 
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enum_with_false_does_not_match0_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enum_with_false_does_not_match0_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enum_with_false_does_not_match0_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_request_body_oapg(
+        return self._post_enum_with_false_does_not_match0_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_request_body_oapg(
+        return self._post_enum_with_false_does_not_match0_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.pyi
index 4c3c7856098..1cf1f4a0c96 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_false_does_not_match0_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_false_does_not_match0_request_body_oapg(
+    def _post_enum_with_false_does_not_match0_request_body(
         self,
         body: typing.Union[request_body.enum_with_false_does_not_match0.EnumWithFalseDoesNotMatch0,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumWithFalseDoesNotMatch0RequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_request_body_oapg(
+        return self._post_enum_with_false_does_not_match0_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_request_body_oapg(
+        return self._post_enum_with_false_does_not_match0_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.py
index f0fcac24eb2..5353b241bef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enum_with_true_does_not_match1_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enum_with_true_does_not_match1_request_body_oapg(
 
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enum_with_true_does_not_match1_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enum_with_true_does_not_match1_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enum_with_true_does_not_match1_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_request_body_oapg(
+        return self._post_enum_with_true_does_not_match1_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_request_body_oapg(
+        return self._post_enum_with_true_does_not_match1_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.pyi
index 00754beaaf8..e247ea5985b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enum_with_true_does_not_match1_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_true_does_not_match1_request_body_oapg(
+    def _post_enum_with_true_does_not_match1_request_body(
         self,
         body: typing.Union[request_body.enum_with_true_does_not_match1.EnumWithTrueDoesNotMatch1,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumWithTrueDoesNotMatch1RequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_request_body_oapg(
+        return self._post_enum_with_true_does_not_match1_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_request_body_oapg(
+        return self._post_enum_with_true_does_not_match1_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.py
index 4626e274b9d..c2b7418d825 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_enums_in_properties_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_enums_in_properties_request_body_oapg(
 
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_enums_in_properties_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_enums_in_properties_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_enums_in_properties_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_request_body_oapg(
+        return self._post_enums_in_properties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_request_body_oapg(
+        return self._post_enums_in_properties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.pyi
index db1bbc51384..84b8de550cf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_enums_in_properties_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enums_in_properties_request_body_oapg(
+    def _post_enums_in_properties_request_body(
         self,
         body: typing.Union[request_body.enums_in_properties.EnumsInProperties,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostEnumsInPropertiesRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_request_body_oapg(
+        return self._post_enums_in_properties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_request_body_oapg(
+        return self._post_enums_in_properties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.py
index 6ecd7491757..3287ab3dae9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_forbidden_property_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_forbidden_property_request_body_oapg(
 
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_forbidden_property_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_forbidden_property_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_forbidden_property_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_request_body_oapg(
+        return self._post_forbidden_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_request_body_oapg(
+        return self._post_forbidden_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.pyi
index 51c6cb8b65d..3072defa0d3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_forbidden_property_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_forbidden_property_request_body_oapg(
+    def _post_forbidden_property_request_body(
         self,
         body: typing.Union[request_body.forbidden_property.ForbiddenProperty,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostForbiddenPropertyRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_request_body_oapg(
+        return self._post_forbidden_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_request_body_oapg(
+        return self._post_forbidden_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.py
index 6d32a33e859..05fc8a5936c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_hostname_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_hostname_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_hostname_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_hostname_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_hostname_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_request_body_oapg(
+        return self._post_hostname_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_request_body_oapg(
+        return self._post_hostname_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.pyi
index 389be2db6f6..ed8500b282f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_hostname_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_hostname_format_request_body_oapg(
+    def _post_hostname_format_request_body(
         self,
         body: typing.Union[request_body.hostname_format.HostnameFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostHostnameFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_request_body_oapg(
+        return self._post_hostname_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_request_body_oapg(
+        return self._post_hostname_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.py
index 682f2a525e8..e5250b57d6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_integer_type_matches_integers_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_integer_type_matches_integers_request_body_oapg(
 
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_integer_type_matches_integers_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_integer_type_matches_integers_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_integer_type_matches_integers_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_request_body_oapg(
+        return self._post_integer_type_matches_integers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_request_body_oapg(
+        return self._post_integer_type_matches_integers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.pyi
index 054043fb2e8..8f942e85477 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_integer_type_matches_integers_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_integer_type_matches_integers_request_body_oapg(
+    def _post_integer_type_matches_integers_request_body(
         self,
         body: typing.Union[request_body.integer_type_matches_integers.IntegerTypeMatchesIntegers,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostIntegerTypeMatchesIntegersRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_request_body_oapg(
+        return self._post_integer_type_matches_integers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_request_body_oapg(
+        return self._post_integer_type_matches_integers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.py
index 516fbe6e5b6..e9088bb5712 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_reques
     ]: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_reques
 
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_reques
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_reques
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_invalid_instance_should_not_raise_error_when_float_division_inf_request
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.pyi
index 6ade7aff187..fdca8acb10a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
         self,
         body: typing.Union[request_body.invalid_instance_should_not_raise_error_when_float_division_inf.InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfRequestBody(Base
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.py
index 3ff2a76da47..e7f211d35f8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_invalid_string_value_for_default_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_invalid_string_value_for_default_request_body_oapg(
 
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_invalid_string_value_for_default_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_invalid_string_value_for_default_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_invalid_string_value_for_default_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_request_body_oapg(
+        return self._post_invalid_string_value_for_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_request_body_oapg(
+        return self._post_invalid_string_value_for_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.pyi
index ef9be0f2232..b4ced0ee09d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_invalid_string_value_for_default_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_string_value_for_default_request_body_oapg(
+    def _post_invalid_string_value_for_default_request_body(
         self,
         body: typing.Union[request_body.invalid_string_value_for_default.InvalidStringValueForDefault,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostInvalidStringValueForDefaultRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_request_body_oapg(
+        return self._post_invalid_string_value_for_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_request_body_oapg(
+        return self._post_invalid_string_value_for_default_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.py
index ae5fa3d4ba1..05c2ad8dcce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ipv4_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ipv4_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ipv4_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ipv4_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ipv4_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_request_body_oapg(
+        return self._post_ipv4_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_request_body_oapg(
+        return self._post_ipv4_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.pyi
index bd46c32db4a..7e999a5edb4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv4_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv4_format_request_body_oapg(
+    def _post_ipv4_format_request_body(
         self,
         body: typing.Union[request_body.ipv4_format.Ipv4Format,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostIpv4FormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_request_body_oapg(
+        return self._post_ipv4_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_request_body_oapg(
+        return self._post_ipv4_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.py
index e4521beadc7..05e6a2792bd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ipv6_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ipv6_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ipv6_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ipv6_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ipv6_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_request_body_oapg(
+        return self._post_ipv6_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_request_body_oapg(
+        return self._post_ipv6_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.pyi
index 22e2e162d16..d0fc6f32dd8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ipv6_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv6_format_request_body_oapg(
+    def _post_ipv6_format_request_body(
         self,
         body: typing.Union[request_body.ipv6_format.Ipv6Format,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostIpv6FormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_request_body_oapg(
+        return self._post_ipv6_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_request_body_oapg(
+        return self._post_ipv6_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.py
index b8b5e9daae4..38d43a8f6ac 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_json_pointer_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_json_pointer_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_json_pointer_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_json_pointer_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_json_pointer_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_request_body_oapg(
+        return self._post_json_pointer_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_request_body_oapg(
+        return self._post_json_pointer_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.pyi
index c593bdcd8ae..73e669ba2f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_json_pointer_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_json_pointer_format_request_body_oapg(
+    def _post_json_pointer_format_request_body(
         self,
         body: typing.Union[request_body.json_pointer_format.JsonPointerFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostJsonPointerFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_request_body_oapg(
+        return self._post_json_pointer_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_request_body_oapg(
+        return self._post_json_pointer_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.py
index 07190ee8abd..a368fa74710 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maximum_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maximum_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maximum_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maximum_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maximum_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_request_body_oapg(
+        return self._post_maximum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_request_body_oapg(
+        return self._post_maximum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.pyi
index 8e386931852..127c2e4abeb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_request_body_oapg(
+    def _post_maximum_validation_request_body(
         self,
         body: typing.Union[request_body.maximum_validation.MaximumValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaximumValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_request_body_oapg(
+        return self._post_maximum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_request_body_oapg(
+        return self._post_maximum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.py
index 1fcc35b0f0c..2128d533090 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
 
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maximum_validation_with_unsigned_integer_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_request_body_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_request_body_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.pyi
index 869c53adef2..bf64cf9406f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maximum_validation_with_unsigned_integer_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_with_unsigned_integer_request_body_oapg(
+    def _post_maximum_validation_with_unsigned_integer_request_body(
         self,
         body: typing.Union[request_body.maximum_validation_with_unsigned_integer.MaximumValidationWithUnsignedInteger,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaximumValidationWithUnsignedIntegerRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_request_body_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_request_body_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.py
index acc75662d8e..6a789548154 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maxitems_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maxitems_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maxitems_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maxitems_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maxitems_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_request_body_oapg(
+        return self._post_maxitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_request_body_oapg(
+        return self._post_maxitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.pyi
index 090989ca581..1e736182506 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxitems_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxitems_validation_request_body_oapg(
+    def _post_maxitems_validation_request_body(
         self,
         body: typing.Union[request_body.maxitems_validation.MaxitemsValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaxitemsValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_request_body_oapg(
+        return self._post_maxitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_request_body_oapg(
+        return self._post_maxitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.py
index 89f53cb9809..42272a68fd9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maxlength_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maxlength_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maxlength_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maxlength_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maxlength_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_request_body_oapg(
+        return self._post_maxlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_request_body_oapg(
+        return self._post_maxlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.pyi
index fb361733737..f75644b8c80 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxlength_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxlength_validation_request_body_oapg(
+    def _post_maxlength_validation_request_body(
         self,
         body: typing.Union[request_body.maxlength_validation.MaxlengthValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaxlengthValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_request_body_oapg(
+        return self._post_maxlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_request_body_oapg(
+        return self._post_maxlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.py
index c230052e39c..82185784611 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
 
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maxproperties0_means_the_object_is_empty_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.pyi
index 96a682d1f07..1585bb46f25 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties0_means_the_object_is_empty_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_request_body(
         self,
         body: typing.Union[request_body.maxproperties0_means_the_object_is_empty.Maxproperties0MeansTheObjectIsEmpty,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaxproperties0MeansTheObjectIsEmptyRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_request_body_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.py
index 974a516968b..7041d9e1e3f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_maxproperties_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_maxproperties_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_maxproperties_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_maxproperties_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_maxproperties_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_request_body_oapg(
+        return self._post_maxproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_request_body_oapg(
+        return self._post_maxproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.pyi
index b2159c2106b..a874fc32623 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_maxproperties_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties_validation_request_body_oapg(
+    def _post_maxproperties_validation_request_body(
         self,
         body: typing.Union[request_body.maxproperties_validation.MaxpropertiesValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMaxpropertiesValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_request_body_oapg(
+        return self._post_maxproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_request_body_oapg(
+        return self._post_maxproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.py
index b946b8f3856..99dc44986b5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_minimum_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_minimum_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_minimum_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_minimum_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_minimum_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_request_body_oapg(
+        return self._post_minimum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_request_body_oapg(
+        return self._post_minimum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.pyi
index a272ec6bc30..149428acc99 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_request_body_oapg(
+    def _post_minimum_validation_request_body(
         self,
         body: typing.Union[request_body.minimum_validation.MinimumValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMinimumValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_request_body_oapg(
+        return self._post_minimum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_request_body_oapg(
+        return self._post_minimum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.py
index 7bd34dc5c3c..822fb7bc040 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_minimum_validation_with_signed_integer_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_minimum_validation_with_signed_integer_request_body_oapg(
 
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_minimum_validation_with_signed_integer_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_minimum_validation_with_signed_integer_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_minimum_validation_with_signed_integer_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_request_body_oapg(
+        return self._post_minimum_validation_with_signed_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_request_body_oapg(
+        return self._post_minimum_validation_with_signed_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.pyi
index d87c10ff21b..5d37e9528aa 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minimum_validation_with_signed_integer_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_with_signed_integer_request_body_oapg(
+    def _post_minimum_validation_with_signed_integer_request_body(
         self,
         body: typing.Union[request_body.minimum_validation_with_signed_integer.MinimumValidationWithSignedInteger,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMinimumValidationWithSignedIntegerRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_request_body_oapg(
+        return self._post_minimum_validation_with_signed_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_request_body_oapg(
+        return self._post_minimum_validation_with_signed_integer_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.py
index 4bbf5a9e332..c70dad0e73c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_minitems_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_minitems_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_minitems_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_minitems_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_minitems_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_request_body_oapg(
+        return self._post_minitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_request_body_oapg(
+        return self._post_minitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.pyi
index 0e1f136459e..0c5fa099112 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minitems_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minitems_validation_request_body_oapg(
+    def _post_minitems_validation_request_body(
         self,
         body: typing.Union[request_body.minitems_validation.MinitemsValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMinitemsValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_request_body_oapg(
+        return self._post_minitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_request_body_oapg(
+        return self._post_minitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.py
index 8e13536eecc..928eb5a8513 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_minlength_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_minlength_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_minlength_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_minlength_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_minlength_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_request_body_oapg(
+        return self._post_minlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_request_body_oapg(
+        return self._post_minlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.pyi
index cbf77ef71dc..647f8a8ec5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minlength_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minlength_validation_request_body_oapg(
+    def _post_minlength_validation_request_body(
         self,
         body: typing.Union[request_body.minlength_validation.MinlengthValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMinlengthValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_request_body_oapg(
+        return self._post_minlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_request_body_oapg(
+        return self._post_minlength_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.py
index 722037db9d4..48d7f5a1182 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_minproperties_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_minproperties_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_minproperties_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_minproperties_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_minproperties_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_request_body_oapg(
+        return self._post_minproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_request_body_oapg(
+        return self._post_minproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.pyi
index 64946536c26..6f37b8c6137 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_minproperties_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minproperties_validation_request_body_oapg(
+    def _post_minproperties_validation_request_body(
         self,
         body: typing.Union[request_body.minproperties_validation.MinpropertiesValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostMinpropertiesValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_request_body_oapg(
+        return self._post_minproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_request_body_oapg(
+        return self._post_minproperties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.py
index f27f7825cf9..5bbb734d484 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
 
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_nested_allof_to_check_validation_semantics_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.pyi
index 50991b8ac59..e4f50d9d919 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_allof_to_check_validation_semantics_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_allof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_allof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_allof_to_check_validation_semantics.NestedAllofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNestedAllofToCheckValidationSemanticsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.py
index 7ef1d3b9873..1e160e84eed 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
 
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_nested_anyof_to_check_validation_semantics_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.pyi
index a3545285f8d..0a6d3c80b90 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_anyof_to_check_validation_semantics_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_anyof_to_check_validation_semantics.NestedAnyofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNestedAnyofToCheckValidationSemanticsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.py
index 8e5d2252489..4314c684dde 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_nested_items_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_nested_items_request_body_oapg(
 
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_nested_items_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_nested_items_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_nested_items_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_request_body_oapg(
+        return self._post_nested_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_request_body_oapg(
+        return self._post_nested_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.pyi
index afd76098d6d..3689aad909e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_items_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_items_request_body_oapg(
+    def _post_nested_items_request_body(
         self,
         body: typing.Union[request_body.nested_items.NestedItems,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNestedItemsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_request_body_oapg(
+        return self._post_nested_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_request_body_oapg(
+        return self._post_nested_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.py
index 224d55f9b78..a53427b198e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
 
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_nested_oneof_to_check_validation_semantics_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.pyi
index c81399a485a..a20ede8b9ec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nested_oneof_to_check_validation_semantics_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_request_body(
         self,
         body: typing.Union[request_body.nested_oneof_to_check_validation_semantics.NestedOneofToCheckValidationSemantics,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNestedOneofToCheckValidationSemanticsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_request_body_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.py
index c6cde38aa4e..54701e3c3e6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_not_more_complex_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_not_more_complex_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_not_more_complex_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_not_more_complex_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_not_more_complex_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_request_body_oapg(
+        return self._post_not_more_complex_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_request_body_oapg(
+        return self._post_not_more_complex_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.pyi
index a8d8586b154..524f456adc7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_more_complex_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_more_complex_schema_request_body_oapg(
+    def _post_not_more_complex_schema_request_body(
         self,
         body: typing.Union[request_body.not_more_complex_schema.NotMoreComplexSchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNotMoreComplexSchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_request_body_oapg(
+        return self._post_not_more_complex_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_request_body_oapg(
+        return self._post_not_more_complex_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.py
index b5b14331e9b..de8675ab9a2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_not_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_not_request_body_oapg(
 
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_not_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_not_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_not_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_request_body_oapg(
+        return self._post_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_request_body_oapg(
+        return self._post_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.pyi
index 92bce18105c..1f87ca83c2a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_not_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_request_body_oapg(
+    def _post_not_request_body(
         self,
         body: typing.Union[request_body._not._Not,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNotRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_request_body_oapg(
+        return self._post_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_request_body_oapg(
+        return self._post_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.py
index 18ca1211505..01fe87ed58c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_nul_characters_in_strings_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_nul_characters_in_strings_request_body_oapg(
 
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_nul_characters_in_strings_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_nul_characters_in_strings_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_nul_characters_in_strings_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_request_body_oapg(
+        return self._post_nul_characters_in_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_request_body_oapg(
+        return self._post_nul_characters_in_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.pyi
index ee4a61164df..8cdae7218c9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_nul_characters_in_strings_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nul_characters_in_strings_request_body_oapg(
+    def _post_nul_characters_in_strings_request_body(
         self,
         body: typing.Union[request_body.nul_characters_in_strings.NulCharactersInStrings,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNulCharactersInStringsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_request_body_oapg(
+        return self._post_nul_characters_in_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_request_body_oapg(
+        return self._post_nul_characters_in_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.py
index e0bee2a744d..6326df34571 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_null_type_matches_only_the_null_object_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_null_type_matches_only_the_null_object_request_body_oapg(
 
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_null_type_matches_only_the_null_object_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_null_type_matches_only_the_null_object_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_null_type_matches_only_the_null_object_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_request_body_oapg(
+        return self._post_null_type_matches_only_the_null_object_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_request_body_oapg(
+        return self._post_null_type_matches_only_the_null_object_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.pyi
index f7194a6bbb0..d7b34487171 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_null_type_matches_only_the_null_object_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_null_type_matches_only_the_null_object_request_body_oapg(
+    def _post_null_type_matches_only_the_null_object_request_body(
         self,
         body: typing.Union[request_body.null_type_matches_only_the_null_object.NullTypeMatchesOnlyTheNullObject,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNullTypeMatchesOnlyTheNullObjectRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_request_body_oapg(
+        return self._post_null_type_matches_only_the_null_object_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_request_body_oapg(
+        return self._post_null_type_matches_only_the_null_object_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.py
index ab5334122ea..5587bb3dbf4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_number_type_matches_numbers_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_number_type_matches_numbers_request_body_oapg(
 
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_number_type_matches_numbers_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_number_type_matches_numbers_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_number_type_matches_numbers_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_request_body_oapg(
+        return self._post_number_type_matches_numbers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_request_body_oapg(
+        return self._post_number_type_matches_numbers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.pyi
index 8e4c08580ab..94815e96519 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_number_type_matches_numbers_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_number_type_matches_numbers_request_body_oapg(
+    def _post_number_type_matches_numbers_request_body(
         self,
         body: typing.Union[request_body.number_type_matches_numbers.NumberTypeMatchesNumbers,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostNumberTypeMatchesNumbersRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_request_body_oapg(
+        return self._post_number_type_matches_numbers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_request_body_oapg(
+        return self._post_number_type_matches_numbers_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.py
index 625714b814f..2e4675158fd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_object_properties_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_object_properties_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_object_properties_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_object_properties_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_object_properties_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_request_body_oapg(
+        return self._post_object_properties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_request_body_oapg(
+        return self._post_object_properties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.pyi
index 833d8ee016f..c043d6fddef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_properties_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_properties_validation_request_body_oapg(
+    def _post_object_properties_validation_request_body(
         self,
         body: typing.Union[request_body.object_properties_validation.ObjectPropertiesValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostObjectPropertiesValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_request_body_oapg(
+        return self._post_object_properties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_request_body_oapg(
+        return self._post_object_properties_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.py
index 0ed330615e4..59eccf542ef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_object_type_matches_objects_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_object_type_matches_objects_request_body_oapg(
 
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_object_type_matches_objects_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_object_type_matches_objects_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_object_type_matches_objects_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_request_body_oapg(
+        return self._post_object_type_matches_objects_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_request_body_oapg(
+        return self._post_object_type_matches_objects_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.pyi
index cb6dd783d7d..db6588ed624 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_object_type_matches_objects_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_type_matches_objects_request_body_oapg(
+    def _post_object_type_matches_objects_request_body(
         self,
         body: typing.Union[request_body.object_type_matches_objects.ObjectTypeMatchesObjects,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostObjectTypeMatchesObjectsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_request_body_oapg(
+        return self._post_object_type_matches_objects_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_request_body_oapg(
+        return self._post_object_type_matches_objects_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.py
index 62aab5582d8..e45bf350c4c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_oneof_complex_types_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_oneof_complex_types_request_body_oapg(
 
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_oneof_complex_types_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_oneof_complex_types_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_oneof_complex_types_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_request_body_oapg(
+        return self._post_oneof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_request_body_oapg(
+        return self._post_oneof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.pyi
index 323edf6f8d4..717a7d774a7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_complex_types_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_complex_types_request_body_oapg(
+    def _post_oneof_complex_types_request_body(
         self,
         body: typing.Union[request_body.oneof_complex_types.OneofComplexTypes,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostOneofComplexTypesRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_request_body_oapg(
+        return self._post_oneof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_request_body_oapg(
+        return self._post_oneof_complex_types_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.py
index 29f5cc110dd..0b5f0f9f500 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_oneof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_oneof_request_body_oapg(
 
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_oneof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_oneof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_oneof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_request_body_oapg(
+        return self._post_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_request_body_oapg(
+        return self._post_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.pyi
index f05ebd6d582..0d009b7aaad 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_request_body_oapg(
+    def _post_oneof_request_body(
         self,
         body: typing.Union[request_body.oneof.Oneof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostOneofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_request_body_oapg(
+        return self._post_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_request_body_oapg(
+        return self._post_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.py
index 65df812f256..fcb00bd710a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_oneof_with_base_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_oneof_with_base_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_oneof_with_base_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_oneof_with_base_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_oneof_with_base_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_request_body_oapg(
+        return self._post_oneof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_request_body_oapg(
+        return self._post_oneof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.pyi
index a41133de2e9..ae2f05e26db 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_base_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_base_schema_request_body_oapg(
+    def _post_oneof_with_base_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_base_schema.OneofWithBaseSchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostOneofWithBaseSchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_request_body_oapg(
+        return self._post_oneof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_request_body_oapg(
+        return self._post_oneof_with_base_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.py
index 536c9ececa9..ae11be9bab5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_oneof_with_empty_schema_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_oneof_with_empty_schema_request_body_oapg(
 
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_oneof_with_empty_schema_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_oneof_with_empty_schema_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_oneof_with_empty_schema_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_request_body_oapg(
+        return self._post_oneof_with_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_request_body_oapg(
+        return self._post_oneof_with_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.pyi
index ca959430c41..da8e229d796 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_empty_schema_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_empty_schema_request_body_oapg(
+    def _post_oneof_with_empty_schema_request_body(
         self,
         body: typing.Union[request_body.oneof_with_empty_schema.OneofWithEmptySchema,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostOneofWithEmptySchemaRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_request_body_oapg(
+        return self._post_oneof_with_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_request_body_oapg(
+        return self._post_oneof_with_empty_schema_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.py
index 450f3d7a5b9..40bced69938 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_oneof_with_required_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_oneof_with_required_request_body_oapg(
 
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_oneof_with_required_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_oneof_with_required_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_oneof_with_required_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_request_body_oapg(
+        return self._post_oneof_with_required_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_request_body_oapg(
+        return self._post_oneof_with_required_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.pyi
index e0b11a90551..ec8b918f29d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_oneof_with_required_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_required_request_body_oapg(
+    def _post_oneof_with_required_request_body(
         self,
         body: typing.Union[request_body.oneof_with_required.OneofWithRequired,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostOneofWithRequiredRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_request_body_oapg(
+        return self._post_oneof_with_required_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_request_body_oapg(
+        return self._post_oneof_with_required_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.py
index 8425322cb40..be35eba0a6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_pattern_is_not_anchored_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_pattern_is_not_anchored_request_body_oapg(
 
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_pattern_is_not_anchored_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_pattern_is_not_anchored_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_pattern_is_not_anchored_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_request_body_oapg(
+        return self._post_pattern_is_not_anchored_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_request_body_oapg(
+        return self._post_pattern_is_not_anchored_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.pyi
index 8b7e0d10d45..af9291d7011 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_is_not_anchored_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_is_not_anchored_request_body_oapg(
+    def _post_pattern_is_not_anchored_request_body(
         self,
         body: typing.Union[request_body.pattern_is_not_anchored.PatternIsNotAnchored,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostPatternIsNotAnchoredRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_request_body_oapg(
+        return self._post_pattern_is_not_anchored_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_request_body_oapg(
+        return self._post_pattern_is_not_anchored_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.py
index 27a467456ae..a1b757f9407 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_pattern_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_pattern_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_pattern_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_pattern_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_pattern_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_request_body_oapg(
+        return self._post_pattern_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_request_body_oapg(
+        return self._post_pattern_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.pyi
index 7c604f7d161..33540585fea 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_pattern_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_validation_request_body_oapg(
+    def _post_pattern_validation_request_body(
         self,
         body: typing.Union[request_body.pattern_validation.PatternValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostPatternValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_request_body_oapg(
+        return self._post_pattern_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_request_body_oapg(
+        return self._post_pattern_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.py
index a52296b778d..ba50f81b649 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_properties_with_escaped_characters_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_properties_with_escaped_characters_request_body_oapg(
 
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_properties_with_escaped_characters_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_properties_with_escaped_characters_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_properties_with_escaped_characters_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_request_body_oapg(
+        return self._post_properties_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_request_body_oapg(
+        return self._post_properties_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.pyi
index 21838f3a2e0..414b10376c8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_properties_with_escaped_characters_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_properties_with_escaped_characters_request_body_oapg(
+    def _post_properties_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.properties_with_escaped_characters.PropertiesWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostPropertiesWithEscapedCharactersRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_request_body_oapg(
+        return self._post_properties_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_request_body_oapg(
+        return self._post_properties_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.py
index ce8cae6c1fd..37084022a41 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
 
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_property_named_ref_that_is_not_a_reference_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.pyi
index b06859c8541..7fb62f97b68 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_property_named_ref_that_is_not_a_reference_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_request_body(
         self,
         body: typing.Union[request_body.property_named_ref_that_is_not_a_reference.PropertyNamedRefThatIsNotAReference,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostPropertyNamedRefThatIsNotAReferenceRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_request_body_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.py
index 8c1d5d41262..fddc7845ef1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_additionalproperties_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_additionalproperties_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_additionalproperties_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_additionalproperties_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_additionalproperties_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_request_body_oapg(
+        return self._post_ref_in_additionalproperties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_request_body_oapg(
+        return self._post_ref_in_additionalproperties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.pyi
index fcde4ebaa7f..140d178cf7d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_additionalproperties_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_additionalproperties_request_body_oapg(
+    def _post_ref_in_additionalproperties_request_body(
         self,
         body: typing.Union[request_body.ref_in_additionalproperties.RefInAdditionalproperties,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInAdditionalpropertiesRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_request_body_oapg(
+        return self._post_ref_in_additionalproperties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_request_body_oapg(
+        return self._post_ref_in_additionalproperties_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.py
index ca4a28f0d78..982057e621c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_allof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_allof_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_allof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_allof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_allof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_request_body_oapg(
+        return self._post_ref_in_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_request_body_oapg(
+        return self._post_ref_in_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.pyi
index 3dc0c73cac5..7b49cc9cc04 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_allof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_allof_request_body_oapg(
+    def _post_ref_in_allof_request_body(
         self,
         body: typing.Union[request_body.ref_in_allof.RefInAllof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInAllofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_request_body_oapg(
+        return self._post_ref_in_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_request_body_oapg(
+        return self._post_ref_in_allof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.py
index 33cc2928267..5ac3f666a09 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_anyof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_anyof_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_anyof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_anyof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_anyof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_request_body_oapg(
+        return self._post_ref_in_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_request_body_oapg(
+        return self._post_ref_in_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.pyi
index 7d82f4ebff1..63bc52a58d9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_anyof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_anyof_request_body_oapg(
+    def _post_ref_in_anyof_request_body(
         self,
         body: typing.Union[request_body.ref_in_anyof.RefInAnyof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInAnyofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_request_body_oapg(
+        return self._post_ref_in_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_request_body_oapg(
+        return self._post_ref_in_anyof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.py
index 2b07c57bf68..b9c2bfbf615 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_items_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_items_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_items_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_items_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_items_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_request_body_oapg(
+        return self._post_ref_in_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_request_body_oapg(
+        return self._post_ref_in_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.pyi
index 24afedbd656..76149eefca8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_items_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_items_request_body_oapg(
+    def _post_ref_in_items_request_body(
         self,
         body: typing.Union[request_body.ref_in_items.RefInItems,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInItemsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_request_body_oapg(
+        return self._post_ref_in_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_request_body_oapg(
+        return self._post_ref_in_items_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.py
index af49f6fdb02..20766880b15 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_not_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_not_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_not_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_not_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_not_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_request_body_oapg(
+        return self._post_ref_in_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_request_body_oapg(
+        return self._post_ref_in_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.pyi
index e6036457556..2ed8222c16f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_not_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_not_request_body_oapg(
+    def _post_ref_in_not_request_body(
         self,
         body: typing.Union[request_body.ref_in_not.RefInNot,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInNotRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_request_body_oapg(
+        return self._post_ref_in_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_request_body_oapg(
+        return self._post_ref_in_not_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.py
index d4bb17164dc..82122ff6a95 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_oneof_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_oneof_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_oneof_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_oneof_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_oneof_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_request_body_oapg(
+        return self._post_ref_in_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_request_body_oapg(
+        return self._post_ref_in_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.pyi
index 2f7b3e9c4a2..37e1549a672 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_oneof_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_oneof_request_body_oapg(
+    def _post_ref_in_oneof_request_body(
         self,
         body: typing.Union[request_body.ref_in_oneof.RefInOneof,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInOneofRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_request_body_oapg(
+        return self._post_ref_in_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_request_body_oapg(
+        return self._post_ref_in_oneof_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.py
index 4b02d400cf5..253d44b67ae 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_ref_in_property_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_ref_in_property_request_body_oapg(
 
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_ref_in_property_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_ref_in_property_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_ref_in_property_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_request_body_oapg(
+        return self._post_ref_in_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_request_body_oapg(
+        return self._post_ref_in_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.pyi
index 2da209948cc..44abae915c9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_ref_in_property_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_property_request_body_oapg(
+    def _post_ref_in_property_request_body(
         self,
         body: typing.Union[request_body.ref_in_property.RefInProperty,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRefInPropertyRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_request_body_oapg(
+        return self._post_ref_in_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_request_body_oapg(
+        return self._post_ref_in_property_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.py
index d548d5688aa..adb13c4bd5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_required_default_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_required_default_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_required_default_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_required_default_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_required_default_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_request_body_oapg(
+        return self._post_required_default_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_request_body_oapg(
+        return self._post_required_default_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.pyi
index 9f0d49c53a1..6c3bc53ee8a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_default_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_default_validation_request_body_oapg(
+    def _post_required_default_validation_request_body(
         self,
         body: typing.Union[request_body.required_default_validation.RequiredDefaultValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRequiredDefaultValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_request_body_oapg(
+        return self._post_required_default_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_request_body_oapg(
+        return self._post_required_default_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.py
index 76e140bb3f4..7174dca3d12 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_required_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_required_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_required_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_required_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_required_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_request_body_oapg(
+        return self._post_required_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_request_body_oapg(
+        return self._post_required_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.pyi
index b1145dbd364..990b36c4ef6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_validation_request_body_oapg(
+    def _post_required_validation_request_body(
         self,
         body: typing.Union[request_body.required_validation.RequiredValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRequiredValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_request_body_oapg(
+        return self._post_required_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_request_body_oapg(
+        return self._post_required_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.py
index 3c9d732fe18..5ac50f9cad3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_required_with_empty_array_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_required_with_empty_array_request_body_oapg(
 
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_required_with_empty_array_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_required_with_empty_array_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_required_with_empty_array_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_request_body_oapg(
+        return self._post_required_with_empty_array_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_request_body_oapg(
+        return self._post_required_with_empty_array_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.pyi
index 30343acbfb2..2a7226978e4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_empty_array_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_empty_array_request_body_oapg(
+    def _post_required_with_empty_array_request_body(
         self,
         body: typing.Union[request_body.required_with_empty_array.RequiredWithEmptyArray,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRequiredWithEmptyArrayRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_request_body_oapg(
+        return self._post_required_with_empty_array_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_request_body_oapg(
+        return self._post_required_with_empty_array_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.py
index 1313132e8b2..17609397839 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_required_with_escaped_characters_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_required_with_escaped_characters_request_body_oapg(
 
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_required_with_escaped_characters_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_required_with_escaped_characters_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_required_with_escaped_characters_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_request_body_oapg(
+        return self._post_required_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_request_body_oapg(
+        return self._post_required_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.pyi
index e623bc1e57f..f21f23e8cb8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_required_with_escaped_characters_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_escaped_characters_request_body_oapg(
+    def _post_required_with_escaped_characters_request_body(
         self,
         body: typing.Union[request_body.required_with_escaped_characters.RequiredWithEscapedCharacters,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostRequiredWithEscapedCharactersRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_request_body_oapg(
+        return self._post_required_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_request_body_oapg(
+        return self._post_required_with_escaped_characters_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.py
index 6187b677c47..1f4b22a4044 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_simple_enum_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_simple_enum_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_simple_enum_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_simple_enum_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_simple_enum_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_request_body_oapg(
+        return self._post_simple_enum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_request_body_oapg(
+        return self._post_simple_enum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.pyi
index d6e33609960..78d5710f974 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_simple_enum_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_simple_enum_validation_request_body_oapg(
+    def _post_simple_enum_validation_request_body(
         self,
         body: typing.Union[request_body.simple_enum_validation.SimpleEnumValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostSimpleEnumValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_request_body_oapg(
+        return self._post_simple_enum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_request_body_oapg(
+        return self._post_simple_enum_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.py
index 7aef4d2a96b..f2165b59b30 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_string_type_matches_strings_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_string_type_matches_strings_request_body_oapg(
 
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_string_type_matches_strings_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_string_type_matches_strings_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_string_type_matches_strings_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_request_body_oapg(
+        return self._post_string_type_matches_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_request_body_oapg(
+        return self._post_string_type_matches_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.pyi
index 8345c0ec16c..4b318686dbb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_string_type_matches_strings_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_string_type_matches_strings_request_body_oapg(
+    def _post_string_type_matches_strings_request_body(
         self,
         body: typing.Union[request_body.string_type_matches_strings.StringTypeMatchesStrings,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostStringTypeMatchesStringsRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_request_body_oapg(
+        return self._post_string_type_matches_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_request_body_oapg(
+        return self._post_string_type_matches_strings_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.py
index fc3a696c509..f35cc018f7a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
     ]: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
 
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_req
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.pyi
index 50516e4a4a6..6ba220a51cf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
         self,
         body: typing.Union[request_body.the_default_keyword_does_not_do_anything_if_the_property_is_missing.TheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissing,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingRequestBody(Ba
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.py
index baf8c56e406..24efddabfc8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_uniqueitems_false_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_uniqueitems_false_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_uniqueitems_false_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_uniqueitems_false_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_uniqueitems_false_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_request_body_oapg(
+        return self._post_uniqueitems_false_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_request_body_oapg(
+        return self._post_uniqueitems_false_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.pyi
index a773f0c23dc..3c35f943284 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_false_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_false_validation_request_body_oapg(
+    def _post_uniqueitems_false_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_false_validation.UniqueitemsFalseValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostUniqueitemsFalseValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_request_body_oapg(
+        return self._post_uniqueitems_false_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_request_body_oapg(
+        return self._post_uniqueitems_false_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.py
index 645d380d8c0..118fc8ecde5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_uniqueitems_validation_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_uniqueitems_validation_request_body_oapg(
 
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_uniqueitems_validation_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_uniqueitems_validation_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_uniqueitems_validation_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_request_body_oapg(
+        return self._post_uniqueitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_request_body_oapg(
+        return self._post_uniqueitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.pyi
index 3d17813af89..d231db66b08 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uniqueitems_validation_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_validation_request_body_oapg(
+    def _post_uniqueitems_validation_request_body(
         self,
         body: typing.Union[request_body.uniqueitems_validation.UniqueitemsValidation,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostUniqueitemsValidationRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_request_body_oapg(
+        return self._post_uniqueitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_request_body_oapg(
+        return self._post_uniqueitems_validation_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.py
index b1719699ff7..d8fec068433 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_uri_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_uri_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_uri_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_uri_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_uri_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_request_body_oapg(
+        return self._post_uri_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_request_body_oapg(
+        return self._post_uri_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.pyi
index ef6e3c97d51..ffc907dcc52 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_format_request_body_oapg(
+    def _post_uri_format_request_body(
         self,
         body: typing.Union[request_body.uri_format.UriFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostUriFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_request_body_oapg(
+        return self._post_uri_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_request_body_oapg(
+        return self._post_uri_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.py
index 09c7f563a41..282b373d404 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_uri_reference_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_uri_reference_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_uri_reference_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_uri_reference_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_uri_reference_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_request_body_oapg(
+        return self._post_uri_reference_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_request_body_oapg(
+        return self._post_uri_reference_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.pyi
index 89270a486e5..36cc7a1ae35 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_reference_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_reference_format_request_body_oapg(
+    def _post_uri_reference_format_request_body(
         self,
         body: typing.Union[request_body.uri_reference_format.UriReferenceFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostUriReferenceFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_request_body_oapg(
+        return self._post_uri_reference_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_request_body_oapg(
+        return self._post_uri_reference_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.py
index 2dea8c5b4dc..9523166d7ef 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _post_uri_template_format_request_body_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _post_uri_template_format_request_body_oapg(
 
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _post_uri_template_format_request_body_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _post_uri_template_format_request_body_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def post_uri_template_format_request_body(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_request_body_oapg(
+        return self._post_uri_template_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_request_body_oapg(
+        return self._post_uri_template_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.pyi
index 1a9660b5cad..9281211fef7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/request_body_post_uri_template_format_request_body/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_template_format_request_body_oapg(
+    def _post_uri_template_format_request_body(
         self,
         body: typing.Union[request_body.uri_template_format.UriTemplateFormat,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class PostUriTemplateFormatRequestBody(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_request_body_oapg(
+        return self._post_uri_template_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_request_body_oapg(
+        return self._post_uri_template_format_request_body(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.py
index ba9e9f788de..7d264fb17ce 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_response_bo
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_response_bo
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_additionalproperties_allows_a_schema_which_should_validate_response_bo
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_additionalproperties_allows_a_schema_which_should_validate_response_bod
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.pyi
index 3bb578905bb..d53c8235bac 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+    def _post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAdditionalpropertiesAllowsASchemaWhichShouldValidateResponseBodyForCon
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_allows_a_schema_which_should_validate_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.py
index 744050fbb74..8a390b5625f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_additionalproperties_are_allowed_by_default_response_body_for_content_
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_additionalproperties_are_allowed_by_default_response_body_for_content_
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_additionalproperties_are_allowed_by_default_response_body_for_content_
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_additionalproperties_are_allowed_by_default_response_body_for_content_t
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.pyi
index 48cf078e4bd..06355870032 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_are_allowed_by_default_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+    def _post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAdditionalpropertiesAreAllowedByDefaultResponseBodyForContentTypes(Bas
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_are_allowed_by_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.py
index 98ec8f1bbd8..0e65013b8c6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_additionalproperties_can_exist_by_itself_response_body_for_content_typ
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_additionalproperties_can_exist_by_itself_response_body_for_content_typ
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_additionalproperties_can_exist_by_itself_response_body_for_content_typ
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_additionalproperties_can_exist_by_itself_response_body_for_content_type
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.pyi
index 641028fbba3..e093a1ebd6f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_can_exist_by_itself_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+    def _post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAdditionalpropertiesCanExistByItselfResponseBodyForContentTypes(BaseAp
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_can_exist_by_itself_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.py
index 4a217974244..e2dde140adb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_additionalproperties_should_not_look_in_applicators_response_body_for_
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_additionalproperties_should_not_look_in_applicators_response_body_for_
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_additionalproperties_should_not_look_in_applicators_response_body_for_
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_additionalproperties_should_not_look_in_applicators_response_body_for_c
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.pyi
index d0d42da5ead..d38acdc3560 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+    def _post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAdditionalpropertiesShouldNotLookInApplicatorsResponseBodyForContentTy
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types_oapg(
+        return self._post_additionalproperties_should_not_look_in_applicators_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.py
index 8299a450c87..c61fa0f6fd6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.pyi
index acd3d3d2106..6f5b52ff08f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_combined_with_anyof_oneof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+    def _post_allof_combined_with_anyof_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofCombinedWithAnyofOneofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types_oapg(
+        return self._post_allof_combined_with_anyof_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.py
index 858ebd67755..fd8050a309b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_response_body_for_content_types_oapg(
+        return self._post_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_response_body_for_content_types_oapg(
+        return self._post_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.pyi
index 29fb409b911..9a6ce8a9823 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_response_body_for_content_types_oapg(
+    def _post_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_response_body_for_content_types_oapg(
+        return self._post_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_response_body_for_content_types_oapg(
+        return self._post_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.py
index decc873d822..10149084bd0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_simple_types_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_simple_types_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_simple_types_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_simple_types_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_response_body_for_content_types_oapg(
+        return self._post_allof_simple_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_response_body_for_content_types_oapg(
+        return self._post_allof_simple_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.pyi
index 5e77e5fbc2f..53c38147388 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_simple_types_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_simple_types_response_body_for_content_types_oapg(
+    def _post_allof_simple_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofSimpleTypesResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_response_body_for_content_types_oapg(
+        return self._post_allof_simple_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_simple_types_response_body_for_content_types_oapg(
+        return self._post_allof_simple_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.py
index 8781865ae43..26cce37d99c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_with_base_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_with_base_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_with_base_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_with_base_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.pyi
index 95064bf777a..5eae3be4c8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_base_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofWithBaseSchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
index 1052f6b7d81..380e074e844 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_with_one_empty_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
index 96e5243e00a..4aa93af8677 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofWithOneEmptySchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.py
index 7da950af702..3ee0dae32d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_with_the_first_empty_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.pyi
index 1915314e606..9234f8b743a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_first_empty_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_first_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofWithTheFirstEmptySchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_first_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.py
index 045f94bb7d4..5ed677770b6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_with_the_last_empty_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.pyi
index ef507249969..5e8b16570a3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_the_last_empty_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+    def _post_allof_with_the_last_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofWithTheLastEmptySchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types_oapg(
+        return self._post_allof_with_the_last_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.py
index 0f66345d7e0..fa924f0e719 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_allof_with_two_empty_schemas_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+        return self._post_allof_with_two_empty_schemas_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+        return self._post_allof_with_two_empty_schemas_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.pyi
index b2f1c9980a4..5211891292a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_allof_with_two_empty_schemas_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+    def _post_allof_with_two_empty_schemas_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAllofWithTwoEmptySchemasResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+        return self._post_allof_with_two_empty_schemas_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_allof_with_two_empty_schemas_response_body_for_content_types_oapg(
+        return self._post_allof_with_two_empty_schemas_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.py
index c2b38ac3557..c5785bd7367 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_anyof_complex_types_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_anyof_complex_types_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_anyof_complex_types_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_anyof_complex_types_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_response_body_for_content_types_oapg(
+        return self._post_anyof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_response_body_for_content_types_oapg(
+        return self._post_anyof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.pyi
index e3766291245..6e9487d0891 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_complex_types_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_complex_types_response_body_for_content_types_oapg(
+    def _post_anyof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAnyofComplexTypesResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_response_body_for_content_types_oapg(
+        return self._post_anyof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_complex_types_response_body_for_content_types_oapg(
+        return self._post_anyof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.py
index a9d03264eed..f39fac65d71 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_anyof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_anyof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_anyof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_anyof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_response_body_for_content_types_oapg(
+        return self._post_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_response_body_for_content_types_oapg(
+        return self._post_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.pyi
index ec0e85cfa28..1a44351c76d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_response_body_for_content_types_oapg(
+    def _post_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAnyofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_response_body_for_content_types_oapg(
+        return self._post_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_response_body_for_content_types_oapg(
+        return self._post_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.py
index de96c057c1d..514d18094a9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_anyof_with_base_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.pyi
index 9471bd62374..6fd3bc2c967 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_base_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAnyofWithBaseSchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
index 8c052903689..8419f7f1be4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_anyof_with_one_empty_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
index 0bd460c55f8..a55215f4c1c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_anyof_with_one_empty_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+    def _post_anyof_with_one_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostAnyofWithOneEmptySchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_anyof_with_one_empty_schema_response_body_for_content_types_oapg(
+        return self._post_anyof_with_one_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.py
index 66743dcc543..45ab893d07f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_array_type_matches_arrays_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_response_body_for_content_types_oapg(
+        return self._post_array_type_matches_arrays_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_response_body_for_content_types_oapg(
+        return self._post_array_type_matches_arrays_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.pyi
index ce751573c0a..7a18122ef08 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_array_type_matches_arrays_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_array_type_matches_arrays_response_body_for_content_types_oapg(
+    def _post_array_type_matches_arrays_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostArrayTypeMatchesArraysResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_response_body_for_content_types_oapg(
+        return self._post_array_type_matches_arrays_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_array_type_matches_arrays_response_body_for_content_types_oapg(
+        return self._post_array_type_matches_arrays_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.py
index 719cc1a53d1..53db86ef0f4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_boolean_type_matches_booleans_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+        return self._post_boolean_type_matches_booleans_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+        return self._post_boolean_type_matches_booleans_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.pyi
index ec6447985cd..f3b90429067 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_boolean_type_matches_booleans_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+    def _post_boolean_type_matches_booleans_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostBooleanTypeMatchesBooleansResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+        return self._post_boolean_type_matches_booleans_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_boolean_type_matches_booleans_response_body_for_content_types_oapg(
+        return self._post_boolean_type_matches_booleans_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.py
index 4e4b81507ae..79923601878 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_by_int_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_by_int_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_by_int_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_by_int_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_response_body_for_content_types_oapg(
+        return self._post_by_int_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_response_body_for_content_types_oapg(
+        return self._post_by_int_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.pyi
index 37ba71981f0..c36d2c8b368 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_int_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_int_response_body_for_content_types_oapg(
+    def _post_by_int_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostByIntResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_response_body_for_content_types_oapg(
+        return self._post_by_int_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_int_response_body_for_content_types_oapg(
+        return self._post_by_int_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.py
index 84e22709e41..80cc5311e0a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_by_number_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_by_number_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_by_number_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_by_number_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_response_body_for_content_types_oapg(
+        return self._post_by_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_response_body_for_content_types_oapg(
+        return self._post_by_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.pyi
index 5fa80bbef25..dbccebe7ebb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_number_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_number_response_body_for_content_types_oapg(
+    def _post_by_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostByNumberResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_response_body_for_content_types_oapg(
+        return self._post_by_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_number_response_body_for_content_types_oapg(
+        return self._post_by_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.py
index 801e0edf49d..17d931961fc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_by_small_number_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_by_small_number_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_by_small_number_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_by_small_number_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_response_body_for_content_types_oapg(
+        return self._post_by_small_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_response_body_for_content_types_oapg(
+        return self._post_by_small_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.pyi
index 9b19be058c1..b25c42eccf7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_by_small_number_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_by_small_number_response_body_for_content_types_oapg(
+    def _post_by_small_number_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostBySmallNumberResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_response_body_for_content_types_oapg(
+        return self._post_by_small_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_by_small_number_response_body_for_content_types_oapg(
+        return self._post_by_small_number_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.py
index 790c3b15d83..0d2a4014491 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_date_time_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_date_time_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_date_time_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_date_time_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_response_body_for_content_types_oapg(
+        return self._post_date_time_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_response_body_for_content_types_oapg(
+        return self._post_date_time_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.pyi
index 5f6a6cddd75..23e8df8bc4d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_date_time_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_date_time_format_response_body_for_content_types_oapg(
+    def _post_date_time_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostDateTimeFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_response_body_for_content_types_oapg(
+        return self._post_date_time_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_date_time_format_response_body_for_content_types_oapg(
+        return self._post_date_time_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.py
index 46f828a984b..f741ac2f164 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_email_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_email_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_email_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_email_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_response_body_for_content_types_oapg(
+        return self._post_email_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_response_body_for_content_types_oapg(
+        return self._post_email_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.pyi
index 98fc26fdbd6..8c501771da4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_email_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_email_format_response_body_for_content_types_oapg(
+    def _post_email_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEmailFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_response_body_for_content_types_oapg(
+        return self._post_email_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_email_format_response_body_for_content_types_oapg(
+        return self._post_email_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.py
index 8a30fa55241..b6446efe4e9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enum_with0_does_not_match_false_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+        return self._post_enum_with0_does_not_match_false_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+        return self._post_enum_with0_does_not_match_false_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.pyi
index 1a3a1b04993..7f70315ff65 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with0_does_not_match_false_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+    def _post_enum_with0_does_not_match_false_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumWith0DoesNotMatchFalseResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+        return self._post_enum_with0_does_not_match_false_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with0_does_not_match_false_response_body_for_content_types_oapg(
+        return self._post_enum_with0_does_not_match_false_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.py
index deedcfacab0..d2e67b0bc0e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enum_with1_does_not_match_true_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+        return self._post_enum_with1_does_not_match_true_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+        return self._post_enum_with1_does_not_match_true_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.pyi
index 4202de7d8f1..d0da9d59408 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with1_does_not_match_true_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+    def _post_enum_with1_does_not_match_true_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumWith1DoesNotMatchTrueResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+        return self._post_enum_with1_does_not_match_true_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with1_does_not_match_true_response_body_for_content_types_oapg(
+        return self._post_enum_with1_does_not_match_true_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.py
index 22d784e834b..34423bd836a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enum_with_escaped_characters_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_enum_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_enum_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
index 38c29b4319e..8eaa1f1de12 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_enum_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumWithEscapedCharactersResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_enum_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_enum_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.py
index 4b154e02ca8..5cbc377038c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enum_with_false_does_not_match0_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+        return self._post_enum_with_false_does_not_match0_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+        return self._post_enum_with_false_does_not_match0_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.pyi
index af68c36d618..966a4bf998e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_false_does_not_match0_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+    def _post_enum_with_false_does_not_match0_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumWithFalseDoesNotMatch0ResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+        return self._post_enum_with_false_does_not_match0_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_false_does_not_match0_response_body_for_content_types_oapg(
+        return self._post_enum_with_false_does_not_match0_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.py
index a2441e8f5ae..f0db9a8443d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enum_with_true_does_not_match1_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+        return self._post_enum_with_true_does_not_match1_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+        return self._post_enum_with_true_does_not_match1_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.pyi
index b29d07ec6ca..da46db30858 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enum_with_true_does_not_match1_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+    def _post_enum_with_true_does_not_match1_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumWithTrueDoesNotMatch1ResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+        return self._post_enum_with_true_does_not_match1_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enum_with_true_does_not_match1_response_body_for_content_types_oapg(
+        return self._post_enum_with_true_does_not_match1_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.py
index fec8b66e6b0..f0d3b16ad3d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_enums_in_properties_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_enums_in_properties_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_enums_in_properties_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_enums_in_properties_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_response_body_for_content_types_oapg(
+        return self._post_enums_in_properties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_response_body_for_content_types_oapg(
+        return self._post_enums_in_properties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.pyi
index 9f75894f5db..78e17322ff2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_enums_in_properties_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_enums_in_properties_response_body_for_content_types_oapg(
+    def _post_enums_in_properties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostEnumsInPropertiesResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_response_body_for_content_types_oapg(
+        return self._post_enums_in_properties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_enums_in_properties_response_body_for_content_types_oapg(
+        return self._post_enums_in_properties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.py
index 86e22e20f0d..baf2f6723a6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_forbidden_property_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_forbidden_property_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_forbidden_property_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_forbidden_property_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_response_body_for_content_types_oapg(
+        return self._post_forbidden_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_response_body_for_content_types_oapg(
+        return self._post_forbidden_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.pyi
index 2a089289858..0e384495615 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_forbidden_property_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_forbidden_property_response_body_for_content_types_oapg(
+    def _post_forbidden_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostForbiddenPropertyResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_response_body_for_content_types_oapg(
+        return self._post_forbidden_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_forbidden_property_response_body_for_content_types_oapg(
+        return self._post_forbidden_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.py
index 9f1752c0e98..2052737646e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_hostname_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_hostname_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_hostname_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_hostname_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_response_body_for_content_types_oapg(
+        return self._post_hostname_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_response_body_for_content_types_oapg(
+        return self._post_hostname_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.pyi
index 6b0bf756638..928fbe1c3f7 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_hostname_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_hostname_format_response_body_for_content_types_oapg(
+    def _post_hostname_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostHostnameFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_response_body_for_content_types_oapg(
+        return self._post_hostname_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_hostname_format_response_body_for_content_types_oapg(
+        return self._post_hostname_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.py
index fbdbbebf95e..1f300c7cd20 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_integer_type_matches_integers_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_response_body_for_content_types_oapg(
+        return self._post_integer_type_matches_integers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_response_body_for_content_types_oapg(
+        return self._post_integer_type_matches_integers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.pyi
index b6fd45e2fd8..cc770012536 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_integer_type_matches_integers_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_integer_type_matches_integers_response_body_for_content_types_oapg(
+    def _post_integer_type_matches_integers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostIntegerTypeMatchesIntegersResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_response_body_for_content_types_oapg(
+        return self._post_integer_type_matches_integers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_integer_type_matches_integers_response_body_for_content_types_oapg(
+        return self._post_integer_type_matches_integers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.py
index 1f5fbb676ac..b67ac601f5c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_respon
     ]: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_respon
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_invalid_instance_should_not_raise_error_when_float_division_inf_respon
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_invalid_instance_should_not_raise_error_when_float_division_inf_respons
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.pyi
index 47e705f8ae1..32f88d5a226 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+    def _post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostInvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInfResponseBodyForC
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types_oapg(
+        return self._post_invalid_instance_should_not_raise_error_when_float_division_inf_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.py
index 85220589fc1..b938c15de2b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_invalid_string_value_for_default_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+        return self._post_invalid_string_value_for_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+        return self._post_invalid_string_value_for_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.pyi
index d818c27cbee..46ae906f00a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_invalid_string_value_for_default_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+    def _post_invalid_string_value_for_default_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostInvalidStringValueForDefaultResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+        return self._post_invalid_string_value_for_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_invalid_string_value_for_default_response_body_for_content_types_oapg(
+        return self._post_invalid_string_value_for_default_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.py
index f8b88870d34..6953fb8705f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ipv4_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ipv4_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ipv4_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ipv4_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_response_body_for_content_types_oapg(
+        return self._post_ipv4_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_response_body_for_content_types_oapg(
+        return self._post_ipv4_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.pyi
index 9b0852a13d5..e7c0b62f077 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv4_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv4_format_response_body_for_content_types_oapg(
+    def _post_ipv4_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostIpv4FormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_response_body_for_content_types_oapg(
+        return self._post_ipv4_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv4_format_response_body_for_content_types_oapg(
+        return self._post_ipv4_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.py
index daa9403c190..2bdd383f767 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ipv6_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ipv6_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ipv6_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ipv6_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_response_body_for_content_types_oapg(
+        return self._post_ipv6_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_response_body_for_content_types_oapg(
+        return self._post_ipv6_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.pyi
index feb7dd5a258..238f19ab71e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ipv6_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ipv6_format_response_body_for_content_types_oapg(
+    def _post_ipv6_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostIpv6FormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_response_body_for_content_types_oapg(
+        return self._post_ipv6_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ipv6_format_response_body_for_content_types_oapg(
+        return self._post_ipv6_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.py
index da78762ecd7..19ed61f596b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_json_pointer_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_json_pointer_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_json_pointer_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_json_pointer_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_response_body_for_content_types_oapg(
+        return self._post_json_pointer_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_response_body_for_content_types_oapg(
+        return self._post_json_pointer_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.pyi
index 72a2a7f0415..627c4cad850 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_json_pointer_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_json_pointer_format_response_body_for_content_types_oapg(
+    def _post_json_pointer_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostJsonPointerFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_response_body_for_content_types_oapg(
+        return self._post_json_pointer_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_json_pointer_format_response_body_for_content_types_oapg(
+        return self._post_json_pointer_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.py
index dda95d297c2..0cdca871666 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maximum_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maximum_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maximum_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maximum_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.pyi
index d1f0c5dbb0f..684a692f656 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_response_body_for_content_types_oapg(
+    def _post_maximum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaximumValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.py
index 63352fb7588..f8ca237d507 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maximum_validation_with_unsigned_integer_response_body_for_content_typ
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maximum_validation_with_unsigned_integer_response_body_for_content_typ
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maximum_validation_with_unsigned_integer_response_body_for_content_typ
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maximum_validation_with_unsigned_integer_response_body_for_content_type
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.pyi
index baf4b47cbf8..91f8ad42ba4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maximum_validation_with_unsigned_integer_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+    def _post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaximumValidationWithUnsignedIntegerResponseBodyForContentTypes(BaseAp
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types_oapg(
+        return self._post_maximum_validation_with_unsigned_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.py
index 8b12a2f5b78..bd28093aaab 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maxitems_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maxitems_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maxitems_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maxitems_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_response_body_for_content_types_oapg(
+        return self._post_maxitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_response_body_for_content_types_oapg(
+        return self._post_maxitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.pyi
index 5cc671847e1..94019754269 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxitems_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxitems_validation_response_body_for_content_types_oapg(
+    def _post_maxitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaxitemsValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_response_body_for_content_types_oapg(
+        return self._post_maxitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxitems_validation_response_body_for_content_types_oapg(
+        return self._post_maxitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.py
index 7f8be647b3c..81663480986 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maxlength_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maxlength_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maxlength_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maxlength_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_response_body_for_content_types_oapg(
+        return self._post_maxlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_response_body_for_content_types_oapg(
+        return self._post_maxlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.pyi
index ec761ecd160..8237df2fcbd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxlength_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxlength_validation_response_body_for_content_types_oapg(
+    def _post_maxlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaxlengthValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_response_body_for_content_types_oapg(
+        return self._post_maxlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxlength_validation_response_body_for_content_types_oapg(
+        return self._post_maxlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.py
index e961b945d8e..fc1d393e446 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_typ
     ]: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_typ
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_typ
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maxproperties0_means_the_object_is_empty_response_body_for_content_type
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.pyi
index d8db07b42ae..c383b16382f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties0_means_the_object_is_empty_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+    def _post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaxproperties0MeansTheObjectIsEmptyResponseBodyForContentTypes(BaseApi
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types_oapg(
+        return self._post_maxproperties0_means_the_object_is_empty_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.py
index af3a2bbd676..8041d80b58b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_maxproperties_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_maxproperties_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_maxproperties_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_maxproperties_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_response_body_for_content_types_oapg(
+        return self._post_maxproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_response_body_for_content_types_oapg(
+        return self._post_maxproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.pyi
index 4a6cc99c8e1..894a50c066d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_maxproperties_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_maxproperties_validation_response_body_for_content_types_oapg(
+    def _post_maxproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMaxpropertiesValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_response_body_for_content_types_oapg(
+        return self._post_maxproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_maxproperties_validation_response_body_for_content_types_oapg(
+        return self._post_maxproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.py
index feb429c5c86..8c08f947329 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_minimum_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_minimum_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_minimum_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_minimum_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.pyi
index d61a14c72be..0054b75673b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_response_body_for_content_types_oapg(
+    def _post_minimum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMinimumValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.py
index bf535ac331c..4a87165f058 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_minimum_validation_with_signed_integer_response_body_for_content_types
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_minimum_validation_with_signed_integer_response_body_for_content_types
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_minimum_validation_with_signed_integer_response_body_for_content_types
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_minimum_validation_with_signed_integer_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.pyi
index 0b60ad20f42..59c2c80e56c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minimum_validation_with_signed_integer_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+    def _post_minimum_validation_with_signed_integer_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMinimumValidationWithSignedIntegerResponseBodyForContentTypes(BaseApi)
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types_oapg(
+        return self._post_minimum_validation_with_signed_integer_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.py
index 1e1ab1ff98f..4f90410b35e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_minitems_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_minitems_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_minitems_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_minitems_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_response_body_for_content_types_oapg(
+        return self._post_minitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_response_body_for_content_types_oapg(
+        return self._post_minitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.pyi
index 1e5c20e22ff..81478d98c7e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minitems_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minitems_validation_response_body_for_content_types_oapg(
+    def _post_minitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMinitemsValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_response_body_for_content_types_oapg(
+        return self._post_minitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minitems_validation_response_body_for_content_types_oapg(
+        return self._post_minitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.py
index 1a73312706a..90e690193d0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_minlength_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_minlength_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_minlength_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_minlength_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_response_body_for_content_types_oapg(
+        return self._post_minlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_response_body_for_content_types_oapg(
+        return self._post_minlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.pyi
index bc04458c874..5a4c1278643 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minlength_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minlength_validation_response_body_for_content_types_oapg(
+    def _post_minlength_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMinlengthValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_response_body_for_content_types_oapg(
+        return self._post_minlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minlength_validation_response_body_for_content_types_oapg(
+        return self._post_minlength_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.py
index 5eed2938616..6be35eddd05 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_minproperties_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_minproperties_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_minproperties_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_minproperties_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_response_body_for_content_types_oapg(
+        return self._post_minproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_response_body_for_content_types_oapg(
+        return self._post_minproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.pyi
index 1397fb2ad32..727c3e11201 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_minproperties_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_minproperties_validation_response_body_for_content_types_oapg(
+    def _post_minproperties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostMinpropertiesValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_response_body_for_content_types_oapg(
+        return self._post_minproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_minproperties_validation_response_body_for_content_types_oapg(
+        return self._post_minproperties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
index 44df2911cf8..412a01907bc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_nested_allof_to_check_validation_semantics_response_body_for_content_t
     ]: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_nested_allof_to_check_validation_semantics_response_body_for_content_t
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_nested_allof_to_check_validation_semantics_response_body_for_content_t
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_nested_allof_to_check_validation_semantics_response_body_for_content_ty
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
index f4f3a8934d7..3bedb971d6b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_allof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNestedAllofToCheckValidationSemanticsResponseBodyForContentTypes(BaseA
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_allof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
index 1ef0db72954..bba1a69952c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_t
     ]: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_t
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_t
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_nested_anyof_to_check_validation_semantics_response_body_for_content_ty
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
index ef244c9159a..a9706b1ca6f 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_anyof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNestedAnyofToCheckValidationSemanticsResponseBodyForContentTypes(BaseA
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_anyof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.py
index b8ad9dd021f..87960011e51 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_nested_items_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_nested_items_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_nested_items_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_nested_items_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_response_body_for_content_types_oapg(
+        return self._post_nested_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_response_body_for_content_types_oapg(
+        return self._post_nested_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.pyi
index 15ac51ae5d7..35aa2e4fde9 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_items_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_items_response_body_for_content_types_oapg(
+    def _post_nested_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNestedItemsResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_response_body_for_content_types_oapg(
+        return self._post_nested_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_items_response_body_for_content_types_oapg(
+        return self._post_nested_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
index 75ca3024985..b8ed689a117 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_t
     ]: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_t
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_t
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_nested_oneof_to_check_validation_semantics_response_body_for_content_ty
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
index 279e439bc36..a85252d54a5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nested_oneof_to_check_validation_semantics_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+    def _post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNestedOneofToCheckValidationSemanticsResponseBodyForContentTypes(BaseA
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types_oapg(
+        return self._post_nested_oneof_to_check_validation_semantics_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.py
index 8fc435cf676..3884bdd96de 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_not_more_complex_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_not_more_complex_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_not_more_complex_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_not_more_complex_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_response_body_for_content_types_oapg(
+        return self._post_not_more_complex_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_response_body_for_content_types_oapg(
+        return self._post_not_more_complex_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.pyi
index 3af7853aa76..8e346741474 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_more_complex_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_more_complex_schema_response_body_for_content_types_oapg(
+    def _post_not_more_complex_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNotMoreComplexSchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_response_body_for_content_types_oapg(
+        return self._post_not_more_complex_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_more_complex_schema_response_body_for_content_types_oapg(
+        return self._post_not_more_complex_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.py
index 85b28e62df6..12b2814453a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_not_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_not_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_not_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_not_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_response_body_for_content_types_oapg(
+        return self._post_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_response_body_for_content_types_oapg(
+        return self._post_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.pyi
index 986344112d9..486c7a0d6e2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_not_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_not_response_body_for_content_types_oapg(
+    def _post_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNotResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_response_body_for_content_types_oapg(
+        return self._post_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_not_response_body_for_content_types_oapg(
+        return self._post_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.py
index b12c9b7d6d9..fba617e3769 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_nul_characters_in_strings_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_response_body_for_content_types_oapg(
+        return self._post_nul_characters_in_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_response_body_for_content_types_oapg(
+        return self._post_nul_characters_in_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.pyi
index e1624a2642b..c297d260868 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_nul_characters_in_strings_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_nul_characters_in_strings_response_body_for_content_types_oapg(
+    def _post_nul_characters_in_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNulCharactersInStringsResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_response_body_for_content_types_oapg(
+        return self._post_nul_characters_in_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_nul_characters_in_strings_response_body_for_content_types_oapg(
+        return self._post_nul_characters_in_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.py
index 66e5bf12416..2e254cb65b3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_null_type_matches_only_the_null_object_response_body_for_content_types
     ]: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_null_type_matches_only_the_null_object_response_body_for_content_types
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_null_type_matches_only_the_null_object_response_body_for_content_types
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_null_type_matches_only_the_null_object_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.pyi
index 9790e3c14a8..20c9eeb59de 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_null_type_matches_only_the_null_object_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+    def _post_null_type_matches_only_the_null_object_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNullTypeMatchesOnlyTheNullObjectResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types_oapg(
+        return self._post_null_type_matches_only_the_null_object_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.py
index 4fbec1ecdd0..5645a4e97a8 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_number_type_matches_numbers_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_response_body_for_content_types_oapg(
+        return self._post_number_type_matches_numbers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_response_body_for_content_types_oapg(
+        return self._post_number_type_matches_numbers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.pyi
index fc34ec0fbe7..a876b542ebb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_number_type_matches_numbers_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_number_type_matches_numbers_response_body_for_content_types_oapg(
+    def _post_number_type_matches_numbers_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostNumberTypeMatchesNumbersResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_response_body_for_content_types_oapg(
+        return self._post_number_type_matches_numbers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_number_type_matches_numbers_response_body_for_content_types_oapg(
+        return self._post_number_type_matches_numbers_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.py
index fe2b4664ae3..ee6029e633b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_object_properties_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_object_properties_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_object_properties_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_object_properties_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_response_body_for_content_types_oapg(
+        return self._post_object_properties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_response_body_for_content_types_oapg(
+        return self._post_object_properties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.pyi
index 18dce986127..9a8a2031ec0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_properties_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_properties_validation_response_body_for_content_types_oapg(
+    def _post_object_properties_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostObjectPropertiesValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_response_body_for_content_types_oapg(
+        return self._post_object_properties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_properties_validation_response_body_for_content_types_oapg(
+        return self._post_object_properties_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.py
index e8f3202a22a..58564eab36d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_object_type_matches_objects_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_object_type_matches_objects_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_object_type_matches_objects_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_object_type_matches_objects_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_response_body_for_content_types_oapg(
+        return self._post_object_type_matches_objects_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_response_body_for_content_types_oapg(
+        return self._post_object_type_matches_objects_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.pyi
index 1ecf7ac9bd9..33c80142139 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_object_type_matches_objects_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_object_type_matches_objects_response_body_for_content_types_oapg(
+    def _post_object_type_matches_objects_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostObjectTypeMatchesObjectsResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_response_body_for_content_types_oapg(
+        return self._post_object_type_matches_objects_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_object_type_matches_objects_response_body_for_content_types_oapg(
+        return self._post_object_type_matches_objects_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.py
index b04788151bf..6c829f05729 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_oneof_complex_types_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_oneof_complex_types_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_oneof_complex_types_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_oneof_complex_types_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_response_body_for_content_types_oapg(
+        return self._post_oneof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_response_body_for_content_types_oapg(
+        return self._post_oneof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.pyi
index 1372c89f653..c07b834ef13 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_complex_types_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_complex_types_response_body_for_content_types_oapg(
+    def _post_oneof_complex_types_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostOneofComplexTypesResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_response_body_for_content_types_oapg(
+        return self._post_oneof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_complex_types_response_body_for_content_types_oapg(
+        return self._post_oneof_complex_types_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.py
index ffd4e7c55f8..45a3b10bd01 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_oneof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_oneof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_oneof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_oneof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_response_body_for_content_types_oapg(
+        return self._post_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_response_body_for_content_types_oapg(
+        return self._post_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.pyi
index c3824102f63..f8090a8e2d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_response_body_for_content_types_oapg(
+    def _post_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostOneofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_response_body_for_content_types_oapg(
+        return self._post_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_response_body_for_content_types_oapg(
+        return self._post_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.py
index 1aff8592d4c..b9575682295 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_oneof_with_base_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.pyi
index dcb1261886e..4e1ef929ae3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_base_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_base_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_base_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostOneofWithBaseSchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_base_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_base_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.py
index 0bd24f2a13c..0c8b00e3f63 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_oneof_with_empty_schema_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.pyi
index be5209b1546..12459a3d351 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_empty_schema_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+    def _post_oneof_with_empty_schema_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostOneofWithEmptySchemaResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_empty_schema_response_body_for_content_types_oapg(
+        return self._post_oneof_with_empty_schema_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.py
index a4aa0e53872..3304dc22599 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_oneof_with_required_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_oneof_with_required_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_oneof_with_required_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_oneof_with_required_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_response_body_for_content_types_oapg(
+        return self._post_oneof_with_required_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_response_body_for_content_types_oapg(
+        return self._post_oneof_with_required_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.pyi
index 4e05ec666ce..8840d3a8d82 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_oneof_with_required_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_oneof_with_required_response_body_for_content_types_oapg(
+    def _post_oneof_with_required_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostOneofWithRequiredResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_response_body_for_content_types_oapg(
+        return self._post_oneof_with_required_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_oneof_with_required_response_body_for_content_types_oapg(
+        return self._post_oneof_with_required_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.py
index 4e03eecc9de..4f53a7c37bf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_pattern_is_not_anchored_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+        return self._post_pattern_is_not_anchored_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+        return self._post_pattern_is_not_anchored_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.pyi
index e99a5b048a4..eea4cae4f8e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_is_not_anchored_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+    def _post_pattern_is_not_anchored_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostPatternIsNotAnchoredResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+        return self._post_pattern_is_not_anchored_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_is_not_anchored_response_body_for_content_types_oapg(
+        return self._post_pattern_is_not_anchored_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.py
index e32cbc25783..38702a9af92 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_pattern_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_pattern_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_pattern_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_pattern_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_response_body_for_content_types_oapg(
+        return self._post_pattern_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_response_body_for_content_types_oapg(
+        return self._post_pattern_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.pyi
index 8fc9f83c233..e56cc8f04aa 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_pattern_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_pattern_validation_response_body_for_content_types_oapg(
+    def _post_pattern_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostPatternValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_response_body_for_content_types_oapg(
+        return self._post_pattern_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_pattern_validation_response_body_for_content_types_oapg(
+        return self._post_pattern_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.py
index 5847e0ed306..1d67f20a0c0 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_properties_with_escaped_characters_response_body_for_content_types_oap
     ]: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_properties_with_escaped_characters_response_body_for_content_types_oap
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_properties_with_escaped_characters_response_body_for_content_types_oap
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_properties_with_escaped_characters_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_properties_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_properties_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
index 1063d498acc..c31306f30ec 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_properties_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_properties_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostPropertiesWithEscapedCharactersResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_properties_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_properties_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_properties_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.py
index 3ef96f2779e..738d46827e5 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_t
     ]: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_t
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_t
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_property_named_ref_that_is_not_a_reference_response_body_for_content_ty
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.pyi
index 05870862eaa..3b335a6a991 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_property_named_ref_that_is_not_a_reference_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+    def _post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostPropertyNamedRefThatIsNotAReferenceResponseBodyForContentTypes(BaseApi
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types_oapg(
+        return self._post_property_named_ref_that_is_not_a_reference_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.py
index 715d56afe80..c07d987e879 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_additionalproperties_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+        return self._post_ref_in_additionalproperties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+        return self._post_ref_in_additionalproperties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.pyi
index e114dc01f23..b9333387a03 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_additionalproperties_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+    def _post_ref_in_additionalproperties_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInAdditionalpropertiesResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+        return self._post_ref_in_additionalproperties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_additionalproperties_response_body_for_content_types_oapg(
+        return self._post_ref_in_additionalproperties_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.py
index 6560d9efd61..ef56313d28d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_allof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_allof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_allof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_allof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_response_body_for_content_types_oapg(
+        return self._post_ref_in_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_response_body_for_content_types_oapg(
+        return self._post_ref_in_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.pyi
index 982b657ad45..a736c317f28 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_allof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_allof_response_body_for_content_types_oapg(
+    def _post_ref_in_allof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInAllofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_response_body_for_content_types_oapg(
+        return self._post_ref_in_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_allof_response_body_for_content_types_oapg(
+        return self._post_ref_in_allof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.py
index c7389074c22..5c683973a4e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_anyof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_anyof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_anyof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_anyof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_response_body_for_content_types_oapg(
+        return self._post_ref_in_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_response_body_for_content_types_oapg(
+        return self._post_ref_in_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.pyi
index f48931d0ed7..df3b50a1a14 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_anyof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_anyof_response_body_for_content_types_oapg(
+    def _post_ref_in_anyof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInAnyofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_response_body_for_content_types_oapg(
+        return self._post_ref_in_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_anyof_response_body_for_content_types_oapg(
+        return self._post_ref_in_anyof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.py
index 2a81d90d44f..9c0122ac221 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_items_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_items_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_items_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_items_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_response_body_for_content_types_oapg(
+        return self._post_ref_in_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_response_body_for_content_types_oapg(
+        return self._post_ref_in_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.pyi
index ce3244fa6bf..af56db1dabc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_items_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_items_response_body_for_content_types_oapg(
+    def _post_ref_in_items_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInItemsResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_response_body_for_content_types_oapg(
+        return self._post_ref_in_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_items_response_body_for_content_types_oapg(
+        return self._post_ref_in_items_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.py
index 105dabd8f19..099a842a5dd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_not_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_not_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_not_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_not_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_response_body_for_content_types_oapg(
+        return self._post_ref_in_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_response_body_for_content_types_oapg(
+        return self._post_ref_in_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.pyi
index 1076808a7ba..8a035bc18cb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_not_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_not_response_body_for_content_types_oapg(
+    def _post_ref_in_not_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInNotResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_response_body_for_content_types_oapg(
+        return self._post_ref_in_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_not_response_body_for_content_types_oapg(
+        return self._post_ref_in_not_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.py
index 5cb1c3e6f6e..3a391396cbf 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_oneof_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_oneof_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_oneof_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_oneof_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_response_body_for_content_types_oapg(
+        return self._post_ref_in_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_response_body_for_content_types_oapg(
+        return self._post_ref_in_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.pyi
index ef839759c80..38a2972638e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_oneof_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_oneof_response_body_for_content_types_oapg(
+    def _post_ref_in_oneof_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInOneofResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_response_body_for_content_types_oapg(
+        return self._post_ref_in_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_oneof_response_body_for_content_types_oapg(
+        return self._post_ref_in_oneof_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.py
index 001a4bb36ce..bb2429d1a5e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_ref_in_property_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_ref_in_property_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_ref_in_property_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_ref_in_property_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_response_body_for_content_types_oapg(
+        return self._post_ref_in_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_response_body_for_content_types_oapg(
+        return self._post_ref_in_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.pyi
index 0f4142d016a..a749dad5e16 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_ref_in_property_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_ref_in_property_response_body_for_content_types_oapg(
+    def _post_ref_in_property_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRefInPropertyResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_response_body_for_content_types_oapg(
+        return self._post_ref_in_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_ref_in_property_response_body_for_content_types_oapg(
+        return self._post_ref_in_property_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.py
index 7dfe6e3f08e..e81170d9ab4 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_required_default_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_required_default_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_required_default_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_required_default_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_response_body_for_content_types_oapg(
+        return self._post_required_default_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_response_body_for_content_types_oapg(
+        return self._post_required_default_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.pyi
index 2d34d20afea..2de9aabc2d1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_default_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_default_validation_response_body_for_content_types_oapg(
+    def _post_required_default_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRequiredDefaultValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_response_body_for_content_types_oapg(
+        return self._post_required_default_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_default_validation_response_body_for_content_types_oapg(
+        return self._post_required_default_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.py
index a925fff2120..d66f2e96af6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_required_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_required_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_required_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_required_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_response_body_for_content_types_oapg(
+        return self._post_required_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_response_body_for_content_types_oapg(
+        return self._post_required_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.pyi
index f07d27cbb7c..67892fd6cb1 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_validation_response_body_for_content_types_oapg(
+    def _post_required_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRequiredValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_response_body_for_content_types_oapg(
+        return self._post_required_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_validation_response_body_for_content_types_oapg(
+        return self._post_required_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.py
index a04b1f04f49..6cdbc741475 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_required_with_empty_array_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_required_with_empty_array_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_required_with_empty_array_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_required_with_empty_array_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_response_body_for_content_types_oapg(
+        return self._post_required_with_empty_array_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_response_body_for_content_types_oapg(
+        return self._post_required_with_empty_array_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.pyi
index 4500c56f650..64d67357acd 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_empty_array_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_empty_array_response_body_for_content_types_oapg(
+    def _post_required_with_empty_array_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRequiredWithEmptyArrayResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_response_body_for_content_types_oapg(
+        return self._post_required_with_empty_array_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_empty_array_response_body_for_content_types_oapg(
+        return self._post_required_with_empty_array_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.py
index fb7f8999ab5..26fd870a0f2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_required_with_escaped_characters_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_required_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_required_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
index 1f9440dbd56..6ba5c55a7a6 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_required_with_escaped_characters_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_required_with_escaped_characters_response_body_for_content_types_oapg(
+    def _post_required_with_escaped_characters_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostRequiredWithEscapedCharactersResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_required_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_required_with_escaped_characters_response_body_for_content_types_oapg(
+        return self._post_required_with_escaped_characters_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.py
index 7936a8ea2ba..44ba1690e6e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_simple_enum_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_simple_enum_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_simple_enum_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_simple_enum_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_response_body_for_content_types_oapg(
+        return self._post_simple_enum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_response_body_for_content_types_oapg(
+        return self._post_simple_enum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.pyi
index 4e9caefec67..e09ab5f2ab2 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_simple_enum_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_simple_enum_validation_response_body_for_content_types_oapg(
+    def _post_simple_enum_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostSimpleEnumValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_response_body_for_content_types_oapg(
+        return self._post_simple_enum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_simple_enum_validation_response_body_for_content_types_oapg(
+        return self._post_simple_enum_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.py
index ed2d72c6a21..0b6ddd88a92 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_string_type_matches_strings_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_string_type_matches_strings_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_string_type_matches_strings_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_string_type_matches_strings_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_response_body_for_content_types_oapg(
+        return self._post_string_type_matches_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_response_body_for_content_types_oapg(
+        return self._post_string_type_matches_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.pyi
index f2918f9959e..9573dc1acbb 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_string_type_matches_strings_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_string_type_matches_strings_response_body_for_content_types_oapg(
+    def _post_string_type_matches_strings_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostStringTypeMatchesStringsResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_response_body_for_content_types_oapg(
+        return self._post_string_type_matches_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_string_type_matches_strings_response_body_for_content_types_oapg(
+        return self._post_string_type_matches_strings_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.py
index 26b7481eff8..9420d72b67a 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
     ]: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_re
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_res
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.pyi
index 8d6f805f588..367d490669d 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+    def _post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostTheDefaultKeywordDoesNotDoAnythingIfThePropertyIsMissingResponseBodyFo
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types_oapg(
+        return self._post_the_default_keyword_does_not_do_anything_if_the_property_is_missing_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.py
index 59ca0c13f28..408acea73c3 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_uniqueitems_false_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_false_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_false_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.pyi
index 6a14b0aee6a..747a8788bde 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_false_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_false_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostUniqueitemsFalseValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_false_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_false_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_false_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.py
index 6c77b2a9922..52dee5f95cc 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_uniqueitems_validation_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_uniqueitems_validation_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_uniqueitems_validation_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_uniqueitems_validation_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.pyi
index 46900ec08a7..c9c8379377b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uniqueitems_validation_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uniqueitems_validation_response_body_for_content_types_oapg(
+    def _post_uniqueitems_validation_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostUniqueitemsValidationResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uniqueitems_validation_response_body_for_content_types_oapg(
+        return self._post_uniqueitems_validation_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.py
index faa0b01b370..9046307c93c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_uri_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_uri_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_uri_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_uri_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_response_body_for_content_types_oapg(
+        return self._post_uri_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_response_body_for_content_types_oapg(
+        return self._post_uri_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.pyi
index 40f7e0b1910..138a616b61b 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_format_response_body_for_content_types_oapg(
+    def _post_uri_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostUriFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_response_body_for_content_types_oapg(
+        return self._post_uri_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_format_response_body_for_content_types_oapg(
+        return self._post_uri_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.py
index 247c6868f13..f503edcc360 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_uri_reference_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_uri_reference_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_uri_reference_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_uri_reference_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_response_body_for_content_types_oapg(
+        return self._post_uri_reference_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_response_body_for_content_types_oapg(
+        return self._post_uri_reference_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.pyi
index cc896c64ba4..485f9ddc39c 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_reference_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_reference_format_response_body_for_content_types_oapg(
+    def _post_uri_reference_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostUriReferenceFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_response_body_for_content_types_oapg(
+        return self._post_uri_reference_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_reference_format_response_body_for_content_types_oapg(
+        return self._post_uri_reference_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.py
index c9fff509f8d..7be73db9f5e 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _post_uri_template_format_response_body_for_content_types_oapg(
     ]: ...
 
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _post_uri_template_format_response_body_for_content_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _post_uri_template_format_response_body_for_content_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -169,7 +169,7 @@ def post_uri_template_format_response_body_for_content_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_response_body_for_content_types_oapg(
+        return self._post_uri_template_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -219,7 +219,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_response_body_for_content_types_oapg(
+        return self._post_uri_template_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.pyi b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.pyi
index fca54893123..8783872dcff 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.pyi
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/paths/response_body_post_uri_template_format_response_body_for_content_types/post/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_uri_template_format_response_body_for_content_types_oapg(
+    def _post_uri_template_format_response_body_for_content_types(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -157,7 +157,7 @@ class PostUriTemplateFormatResponseBodyForContentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_response_body_for_content_types_oapg(
+        return self._post_uri_template_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -207,7 +207,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_uri_template_format_response_body_for_content_types_oapg(
+        return self._post_uri_template_format_response_body_for_content_types(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
index 31554fd76c6..0f5f7658064 100644
--- a/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
+++ b/samples/openapi3/client/3_0_3_unit_test/python/unit_test_api/schemas.py
@@ -46,17 +46,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     """
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
-            if _arg.closed:
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(arg_, (io.FileIO, io.BufferedReader)):
+            if arg_.closed:
                 raise exceptions.ApiValueError('Invalid file state; file is closed and must be open')
-            _arg.close()
-            inst = super(FileIO, cls).__new__(cls, _arg.name)
-            super(FileIO, inst).__init__(_arg.name)
+            arg_.close()
+            inst = super(FileIO, cls).__new__(cls, arg_.name)
+            super(FileIO, inst).__init__(arg_.name)
             return inst
-        raise exceptions.ApiValueError('FileIO must be passed _arg which contains the open file')
+        raise exceptions.ApiValueError('FileIO must be passed arg_ which contains the open file')
 
-    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, arg_: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -150,11 +150,11 @@ def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_t
 class Singleton:
     """
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, _arg)
+    The same instance is returned for a given key of (cls, arg_)
     """
     _instances = {}
 
-    def __new__(cls, _arg: typing.Any, **kwargs):
+    def __new__(cls, arg_: typing.Any, **kwargs):
         """
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -162,15 +162,15 @@ def __new__(cls, _arg: typing.Any, **kwargs):
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of arg_ ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         """
-        key = (cls, _arg, str(_arg))
+        key = (cls, arg_, str(arg_))
         if key not in cls._instances:
-            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(arg_, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, _arg)
+                cls._instances[key] = super().__new__(cls, arg_)
         return cls._instances[key]
 
     def __repr__(self):
@@ -218,7 +218,7 @@ def __bool__(self) -> bool:
         raise ValueError('Unable to find the boolean value of this instance')
 
 
-class MetaOapgTyped:
+class SchemaTyped:
     types: typing.Optional[typing.Set[typing.Type]]
     exclusive_maximum: typing.Union[int, float]
     inclusive_maximum: typing.Union[int, float]
@@ -324,7 +324,7 @@ def validate_enum(
     return None
 
 
-def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+def _raise_validation_error_message(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
     raise exceptions.ApiValueError(
         "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
             value=value,
@@ -345,7 +345,7 @@ def validate_unique_items(
     if not unique_items_value or not isinstance(arg, tuple):
         return None
     if len(arg) > len(set(arg)):
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
             constraint_value='unique_items==True',
@@ -363,7 +363,7 @@ def validate_min_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) < min_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be greater than or equal to",
             constraint_value=min_items,
@@ -381,7 +381,7 @@ def validate_max_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) > max_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be less than or equal to",
             constraint_value=max_items,
@@ -399,7 +399,7 @@ def validate_min_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) < min_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be greater than or equal to",
             constraint_value=min_properties,
@@ -417,7 +417,7 @@ def validate_max_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) > max_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be less than or equal to",
             constraint_value=max_properties,
@@ -435,7 +435,7 @@ def validate_min_length(
     if not isinstance(arg, str):
         return None
     if len(arg) < min_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be greater than or equal to",
             constraint_value=min_length,
@@ -453,7 +453,7 @@ def validate_max_length(
     if not isinstance(arg, str):
         return None
     if len(arg) > max_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be less than or equal to",
             constraint_value=max_length,
@@ -471,7 +471,7 @@ def validate_inclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg < inclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than or equal to",
             constraint_value=inclusive_minimum,
@@ -489,7 +489,7 @@ def validate_exclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg <= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than",
             constraint_value=exclusive_minimum,
@@ -507,7 +507,7 @@ def validate_inclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg > inclusive_maximum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than or equal to",
             constraint_value=inclusive_maximum,
@@ -525,7 +525,7 @@ def validate_exclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg >= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than",
             constraint_value=exclusive_maximum,
@@ -543,7 +543,7 @@ def validate_multiple_of(
         return None
     if (not (float(arg) / multiple_of).is_integer()):
         # Note 'multipleOf' will be as good as the floating point arithmetic.
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="value must be a multiple of",
             constraint_value=multiple_of,
@@ -565,14 +565,14 @@ def validate_regex(
         if flags != 0:
             # Don't print the regex flags if the flags are not
             # specified in the OAS document.
-            _raise_validation_error_message_oapg(
+            _raise_validation_error_message(
                 value=arg,
                 constraint_msg="must match regular expression",
                 constraint_value=regex_dict['pattern'],
                 path_to_item=validation_metadata.path_to_item,
                 additional_txt=" with flags=`{}`".format(flags)
             )
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must match regular expression",
             constraint_value=regex_dict['pattern'],
@@ -755,7 +755,7 @@ def validate_required(
     return None
 
 
-def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+def _get_class(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
     if isinstance(item_cls, types.FunctionType):
         # referenced schema
         return item_cls()
@@ -773,7 +773,7 @@ def validate_items(
 ) -> PathToSchemasType:
     if not isinstance(arg, tuple):
         return None
-    item_cls = _get_class_oapg(item_cls)
+    item_cls = _get_class(item_cls)
     path_to_schemas = {}
     for i, value in enumerate(arg):
         item_validation_metadata = ValidationMetadata(
@@ -784,7 +784,7 @@ def validate_items(
         if item_validation_metadata.validation_ran_earlier(item_cls):
             add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = item_cls._validate_oapg(
+        other_path_to_schemas = item_cls._validate(
             value, validation_metadata=item_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
@@ -803,7 +803,7 @@ def validate_properties(
     for property_name, value in present_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
         schema = properties.__annotations__[property_name]
-        schema = _get_class_oapg(schema)
+        schema = _get_class(schema)
         arg_validation_metadata = ValidationMetadata(
             path_to_item=path_to_item,
             configuration=validation_metadata.configuration,
@@ -812,7 +812,7 @@ def validate_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -825,9 +825,9 @@ def validate_additional_properties(
 ) -> typing.Optional[PathToSchemasType]:
     if not isinstance(arg, frozendict.frozendict):
         return None
-    schema = _get_class_oapg(additional_properties_schema)
+    schema = _get_class(additional_properties_schema)
     path_to_schemas = {}
-    properties_annotations = cls.MetaOapg.Properties.__annotations__ if hasattr(cls.MetaOapg, 'Properties') else {}
+    properties_annotations = cls.Schema_.Properties.__annotations__ if hasattr(cls.Schema_, 'Properties') else {}
     present_additional_properties = {k: v for k, v, in arg.items() if k not in properties_annotations}
     for property_name, value in present_additional_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
@@ -839,7 +839,7 @@ def validate_additional_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -853,14 +853,14 @@ def validate_one_of(
     oneof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for one_of_cls in one_of_container_cls.classes:
-        schema = _get_class_oapg(one_of_cls)
+        schema = _get_class(one_of_cls)
         if schema in path_to_schemas[validation_metadata.path_to_item]:
             oneof_classes.append(schema)
             continue
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             oneof_classes.append(schema)
             continue
@@ -869,7 +869,7 @@ def validate_one_of(
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
         try:
-            path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate oneof_classes
             continue
@@ -897,11 +897,11 @@ def validate_any_of(
     anyof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for any_of_cls in any_of_container_cls.classes:
-        schema = _get_class_oapg(any_of_cls)
+        schema = _get_class(any_of_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             anyof_classes.append(schema)
             continue
@@ -911,7 +911,7 @@ def validate_any_of(
             continue
 
         try:
-            other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate anyof_classes
             continue
@@ -933,17 +933,17 @@ def validate_all_of(
 ) -> PathToSchemasType:
     path_to_schemas = collections.defaultdict(set)
     for allof_cls in all_of_cls.classes:
-        schema = _get_class_oapg(allof_cls)
+        schema = _get_class(allof_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             continue
         if validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -954,7 +954,7 @@ def validate_not(
     cls: typing.Type,
     validation_metadata: ValidationMetadata,
 ) -> None:
-    not_schema = _get_class_oapg(not_cls)
+    not_schema = _get_class(not_cls)
     other_path_to_schemas = None
     not_exception = exceptions.ApiValueError(
         "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
@@ -967,7 +967,7 @@ def validate_not(
         raise not_exception
 
     try:
-        other_path_to_schemas = not_schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = not_schema._validate(arg, validation_metadata=validation_metadata)
     except (exceptions.ApiValueError, exceptions.ApiTypeError):
         pass
     if other_path_to_schemas:
@@ -992,38 +992,38 @@ def __get_discriminated_class(cls, disc_property_name: str, disc_payload_value:
     """
     Used in schemas with discriminators
     """
-    if not hasattr(cls.MetaOapg, 'discriminator'):
+    if not hasattr(cls.Schema_, 'discriminator'):
         return None
-    disc = cls.MetaOapg.discriminator()
+    disc = cls.Schema_.discriminator()
     if disc_property_name not in disc:
         return None
     discriminated_cls = disc[disc_property_name].get(disc_payload_value)
     if discriminated_cls is not None:
         return discriminated_cls
     if not (
-        hasattr(cls.MetaOapg, 'AllOf') or
-        hasattr(cls.MetaOapg, 'OneOf') or
-        hasattr(cls.MetaOapg, 'AnyOf')
+        hasattr(cls.Schema_, 'AllOf') or
+        hasattr(cls.Schema_, 'OneOf') or
+        hasattr(cls.Schema_, 'AnyOf')
     ):
         return None
     # TODO stop traveling if a cycle is hit
-    if hasattr(cls.MetaOapg, 'AllOf'):
-        for allof_cls in cls.MetaOapg.AllOf.classes:
-            allof_cls = _get_class_oapg(allof_cls)
+    if hasattr(cls.Schema_, 'AllOf'):
+        for allof_cls in cls.Schema_.AllOf.classes:
+            allof_cls = _get_class(allof_cls)
             discriminated_cls = __get_discriminated_class(
                 allof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'OneOf'):
-        for oneof_cls in cls.MetaOapg.OneOf.classes:
-            oneof_cls = _get_class_oapg(oneof_cls)
+    if hasattr(cls.Schema_, 'OneOf'):
+        for oneof_cls in cls.Schema_.OneOf.classes:
+            oneof_cls = _get_class(oneof_cls)
             discriminated_cls = __get_discriminated_class(
                 oneof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'AnyOf'):
-        for anyof_cls in cls.MetaOapg.AnyOf.classes:
-            anyof_cls = _get_class_oapg(anyof_cls)
+    if hasattr(cls.Schema_, 'AnyOf'):
+        for anyof_cls in cls.Schema_.AnyOf.classes:
+            anyof_cls = _get_class(anyof_cls)
             discriminated_cls = __get_discriminated_class(
                 anyof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
@@ -1057,7 +1057,7 @@ def validate_discriminator(
     if discriminated_cls is cls:
         """
         Optimistically assume that cls will pass validation
-        If the code invoked _validate_oapg on cls it would infinitely recurse
+        If the code invoked _validate on cls it would infinitely recurse
         """
         return None
     if validation_metadata.validation_ran_earlier(discriminated_cls):
@@ -1070,7 +1070,7 @@ def validate_discriminator(
         seen_classes=validation_metadata.seen_classes | frozenset({cls}),
         validated_path_to_schemas=validation_metadata.validated_path_to_schemas
     )
-    return discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
+    return discriminated_cls._validate(arg, validation_metadata=updated_vm)
 
 
 json_schema_keyword_to_validator = {
@@ -1111,7 +1111,7 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
     __excluded_cls_properties = {
         '__module__',
         '__dict__',
@@ -1120,7 +1120,7 @@ class Schema:
     }
 
     @classmethod
-    def _validate_oapg(
+    def _validate(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
@@ -1132,7 +1132,7 @@ def _validate_oapg(
         """
         json_schema_data = {
             k: v
-            for k, v in vars(cls.MetaOapg).items()
+            for k, v in vars(cls.Schema_).items()
             if k not in cls.__excluded_cls_properties
             and k
             not in validation_metadata.configuration.disabled_json_schema_python_keywords
@@ -1158,7 +1158,7 @@ def _validate_oapg(
         return path_to_schemas
 
     @staticmethod
-    def _process_schema_classes_oapg(
+    def _process_schema_classes(
         schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
     ):
         """
@@ -1207,21 +1207,21 @@ def __get_new_cls(
 
         Dict property + List Item Assignment Use cases:
         1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
+            the value is validated by _validate
+            _validate returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
         2. value is an instance of the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
+            the value is NOT validated by _validate, _validate only checks that the instance is of the correct schema type
+            for this value, _validate does NOT return an entry for it in _path_to_schemas
+            and in list/dict _get_items,_get_properties the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         """
         _path_to_schemas = {}
         if validation_metadata.validation_ran_earlier(cls):
             add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
         else:
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
         # do not modify the returned result because it is cached and we would be modifying the cached value
@@ -1235,9 +1235,9 @@ def __get_new_cls(
                 Singleton already added
             3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
             """
-            cls._process_schema_classes_oapg(schema_classes)
+            cls._process_schema_classes(schema_classes)
             enum_schema = any(
-                issubclass(this_cls, Schema) and hasattr(this_cls.MetaOapg, "enum_value_to_name")
+                issubclass(this_cls, Schema) and hasattr(this_cls.Schema_, "enum_value_to_name")
                 for this_cls in schema_classes
             )
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
@@ -1265,7 +1265,7 @@ def __get_new_cls(
         return path_to_schemas
 
     @classmethod
-    def _get_new_instance_without_conversion_oapg(
+    def _get_new_instance_without_conversion(
         cls,
         arg: typing.Any,
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
@@ -1273,10 +1273,10 @@ def _get_new_instance_without_conversion_oapg(
     ):
         # We have a Dynamic class and we are making an instance of it
         if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
+            properties = cls._get_properties(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, properties)
         elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
+            items = cls._get_items(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, items)
         """
         str = openapi str, datetime.date, and datetime.datetime
@@ -1287,7 +1287,7 @@ def _get_new_instance_without_conversion_oapg(
         return super(Schema, cls).__new__(cls, arg)
 
     @classmethod
-    def from_openapi_data_oapg(
+    def from_openapi_data_(
         cls,
         arg: typing.Union[
             str,
@@ -1301,10 +1301,10 @@ def from_openapi_data_oapg(
             io.BufferedReader,
             bytes
         ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None
+        configuration_: typing.Optional[configuration_module.Configuration] = None
     ):
         """
-        Schema from_openapi_data_oapg
+        Schema from_openapi_data_
         """
         from_server = True
         validated_path_to_schemas = {}
@@ -1312,12 +1312,12 @@ def from_openapi_data_oapg(
         arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas, ('args[0]',), path_to_type)
         validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(validated_path_to_schemas)
         )
         path_to_schemas = cls.__get_new_cls(arg, validation_metadata, path_to_type)
         new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
+        new_inst = new_cls._get_new_instance_without_conversion(
             arg,
             validation_metadata.path_to_item,
             path_to_schemas
@@ -1339,7 +1339,7 @@ def __remove_unsets(kwargs):
 
     def __new__(
         cls,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict,
             frozendict.frozendict,
             list,
@@ -1357,7 +1357,7 @@ def __new__(
             io.FileIO,
             io.BufferedReader,
             'Schema',        ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict,
             frozendict.frozendict,
@@ -1382,23 +1382,23 @@ def __new__(
         Schema __new__
 
         Args:
-            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            args_ (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the configuration_module.Configuration that enables json schema validation keywords
+            configuration_: contains the configuration_module.Configuration that enables json schema validation keywords
                 like minItems, minLength etc
 
         Note: double underscores are used here because pycharm thinks that these variables
         are instance properties if they are named normally :(
         """
         __kwargs = cls.__remove_unsets(kwargs)
-        if not _args and not __kwargs:
+        if not args_ and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and _args and not isinstance(_args[0], dict):
-            __arg = _args[0]
+        if not __kwargs and args_ and not isinstance(args_[0], dict):
+            __arg = args_[0]
         else:
-            __arg = cls.__get_input_dict(*_args, **__kwargs)
+            __arg = cls.__get_input_dict(*args_, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __path_to_type = {}
@@ -1406,12 +1406,12 @@ def __new__(
             __arg, __from_server, __validated_path_to_schemas, ('args[0]',), __path_to_type)
         __validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(__validated_path_to_schemas)
         )
         __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata, __path_to_type)
         __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
+        return __new_cls._get_new_instance_without_conversion(
             __arg,
             __validation_metadata.path_to_item,
             __path_to_schemas
@@ -1419,9 +1419,9 @@ def __new__(
 
     def __init__(
         self,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
@@ -1732,7 +1732,7 @@ class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
 
 
 class BoolBase:
-    def is_true_oapg(self) -> bool:
+    def is_true_(self) -> bool:
         """
         A replacement for x is True
         True if the instance is a BoolClass True Singleton
@@ -1741,7 +1741,7 @@ def is_true_oapg(self) -> bool:
             return False
         return bool(self)
 
-    def is_false_oapg(self) -> bool:
+    def is_false_(self) -> bool:
         """
         A replacement for x is False
         True if the instance is a BoolClass False Singleton
@@ -1752,7 +1752,7 @@ def is_false_oapg(self) -> bool:
 
 
 class NoneBase:
-    def is_none_oapg(self) -> bool:
+    def is_none_(self) -> bool:
         """
         A replacement for x is None
         True if the instance is a NoneClass None Singleton
@@ -1763,47 +1763,47 @@ def is_none_oapg(self) -> bool:
 
 
 class StrBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_str_oapg(self) -> str:
+    def as_str_(self) -> str:
         return self
 
     @property
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         raise Exception('not implemented')
 
     @property
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         raise Exception('not implemented')
 
     @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         raise Exception('not implemented')
 
     @property
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         raise Exception('not implemented')
 
 
 class UUIDBase:
     @property
     @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         return uuid.UUID(self)
 
 
 class DateBase:
     @property
     @functools.lru_cache()
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
 
 class DateTimeBase:
     @property
     @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
 
@@ -1816,15 +1816,15 @@ class DecimalBase:
 
     @property
     @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
 
 class NumberBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -1844,7 +1844,7 @@ def as_int_oapg(self) -> int:
             return self._as_int
 
     @property
-    def as_float_oapg(self) -> float:
+    def as_float_(self) -> float:
         try:
             return self._as_float
         except AttributeError:
@@ -1855,24 +1855,24 @@ def as_float_oapg(self) -> float:
 
 
 class ListBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @classmethod
-    def _get_items_oapg(
+    def _get_items(
         cls: 'Schema',
         arg: typing.List[typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         '''
-        ListBase _get_items_oapg
+        ListBase _get_items
         '''
         cast_items = []
 
         for i, value in enumerate(arg):
             item_path_to_item = path_to_item + (i,)
             item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
+            new_value = item_cls._get_new_instance_without_conversion(
                 value,
                 item_path_to_item,
                 path_to_schemas
@@ -1884,14 +1884,14 @@ def _get_items_oapg(
 
 class DictBase:
     @classmethod
-    def _get_properties_oapg(
+    def _get_properties(
         cls,
         arg: typing.Dict[str, typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         """
-        DictBase _get_properties_oapg, this is how properties are set
+        DictBase _get_properties, this is how properties are set
         These values already passed validation
         """
         dict_items = {}
@@ -1899,7 +1899,7 @@ def _get_properties_oapg(
         for property_name_js, value in arg.items():
             property_path_to_item = path_to_item + (property_name_js,)
             property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
+            new_value = property_cls._get_new_instance_without_conversion(
                 value,
                 property_path_to_item,
                 path_to_schemas
@@ -1928,7 +1928,7 @@ def __getattr__(self, name: str):
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+    def get_item_(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
         # dict_instance[name] accessor
         if not isinstance(self, frozendict.frozendict):
             raise NotImplementedError()
@@ -2085,15 +2085,15 @@ class ListSchema(
     Schema,
     TupleMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.List[typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NoneSchema(
@@ -2101,15 +2101,15 @@ class NoneSchema(
     Schema,
     NoneMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: None, **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: None, **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NumberSchema(
@@ -2121,20 +2121,20 @@ class NumberSchema(
     This is used for type: number with no format
     Both integers AND floats are accepted
     """
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Union[int, float], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class IntBase:
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -2143,22 +2143,22 @@ def as_int_oapg(self) -> int:
 
 
 class IntSchema(IntBase, NumberSchema):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: int, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class Int32Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int32'
 
@@ -2166,7 +2166,7 @@ class MetaOapg:
 class Int64Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int64'
 
@@ -2174,25 +2174,25 @@ class MetaOapg:
 class Float32Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'float'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class Float64Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'double'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class StrSchema(
@@ -2206,50 +2206,50 @@ class StrSchema(
     - type: string (format unset)
     - type: string, format: date
     """
-    class MetaOapg:
+    class Schema_:
         types = {str}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'number'
 
-    def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
+    def __new__(cls, arg_: str, **kwargs: configuration_module.Configuration):
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2258,7 +2258,7 @@ def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         """
-        return super().__new__(cls, _arg, **kwargs)
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class BytesSchema(
@@ -2268,11 +2268,11 @@ class BytesSchema(
     """
     this class will subclass bytes and is immutable
     """
-    class MetaOapg:
+    class Schema_:
         types = {bytes}
 
-    def __new__(cls, _arg: bytes, **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: bytes, **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class FileSchema(
@@ -2295,18 +2295,18 @@ class FileSchema(
     - to allow file reading and writing to disk
     - to be able to preserve file name info
     """
-    class MetaOapg:
+    class Schema_:
         types = {FileIO}
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class BinarySchema(
     Schema,
     BinaryMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {FileIO, bytes}
         format = 'binary'
 
@@ -2316,8 +2316,8 @@ class OneOf:
                 FileSchema,
             ]
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_)
 
 
 class BoolSchema(
@@ -2325,15 +2325,15 @@ class BoolSchema(
     Schema,
     BoolMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {BoolClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: bool, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class AnyTypeSchema(
@@ -2347,7 +2347,7 @@ class AnyTypeSchema(
     NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
-    class MetaOapg:
+    class Schema_:
         pass
 
 
@@ -2363,18 +2363,18 @@ class NotAnyTypeSchema(AnyTypeSchema):
     Note: validations on this class are never run because the code knows that no inputs will ever validate
     """
 
-    class MetaOapg:
+    class Schema_:
         _not = AnyTypeSchema
 
     def __new__(
         cls,
-        *_args,
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        *args_,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
 
 
@@ -2383,15 +2383,15 @@ class DictSchema(
     Schema,
     FrozenDictMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *_args, **kwargs)
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
+        return super().__new__(cls, *args_, **kwargs)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/README.md b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/README.md
index 48f4adb809f..0c133fee6bd 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/README.md
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/README.md
@@ -27,25 +27,25 @@ Python &gt;&#x3D;3.7
         - ingested None will subclass NoneClass
         - ingested True will subclass BoolClass
         - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
+        - So if you need to check is True/False/None, instead use instance.is_true_()/.is_false_()/.is_none_()
 5. All validated class instances are immutable except for ones based on io.File
     - This is because if properties were changed after validation, that validation would no longer apply
     - So no changing values or property values after a class has been instantiated
 6. String + Number types with formats
     - String type data is stored as a string and if you need to access types based on its format like date,
     date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
+    - type string + format: See .as_date_, .as_datetime_, .as_decimal_, .as_uuid_
+    - type number + format: See .as_float_, .as_int_
     - this was done because openapi/json-schema defines constraints. string data may be type string with no format
     keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
+    - So if you need to access a string format based type, use as_date_/as_datetime_/as_decimal_/as_uuid_
+    - So if you need to access a number format based type, use as_int_/as_float_
 7. Property access on AnyType(type unset) or object(dict) schemas
     - Only required keys with valid python names are properties like .someProp and have type hints
     - All optional keys may not exist, so properties are not defined for them
     - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+    - Use get_item_ if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_('optionalProp')
         - All required and optional keys have type hints for this method, and @typing.overload is used
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
@@ -61,19 +61,18 @@ Python &gt;&#x3D;3.7
     - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
     - So you will need to update your import paths to the api classes
 
-### Why are Oapg and _oapg used in class and method names?
+### Why are Leading and Trailing Underscores in class and method names?
 Classes can have arbitrarily named properties set on them
 Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
+For those reasons, I use the prefix and suffix _ to greatly reduce the likelihood of collisions
 on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
 
 ### Object property spec case
 This was done because when payloads are ingested, they can be validated against N number of schemas.
 If the input signature used a different property name then that has mutated the payload.
 So SchemaA and SchemaB must both see the camelCase spec named variable.
 Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
+That use case should work, so spec case is used.
 
 ### Parameter spec case
 Parameters can be included in different locations including:
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_addition_operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_addition_operator.py
index e63c41beae9..388d65d762b 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_addition_operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_addition_operator.py
@@ -18,7 +18,7 @@
 
 class TestAdditionOperator(unittest.TestCase):
     """AdditionOperator unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_operator.py
index 9132c7358e4..5d2c797e2eb 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_operator.py
@@ -18,7 +18,7 @@
 
 class TestOperator(unittest.TestCase):
     """Operator unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_subtraction_operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_subtraction_operator.py
index 30f000f9550..4bdab9a0bf7 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_subtraction_operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/components/schema/test_subtraction_operator.py
@@ -18,7 +18,7 @@
 
 class TestSubtractionOperator(unittest.TestCase):
     """SubtractionOperator unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/test_paths/test_operators/test_post.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/test_paths/test_operators/test_post.py
index 18640b7aa2d..28a1dae982e 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/test_paths/test_operators/test_post.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/test/test_paths/test_operators/test_post.py
@@ -22,10 +22,10 @@ class TestOperators(ApiTestMixin, unittest.TestCase):
     """
     Operators unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/api_client.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/api_client.py
index 3e926e1a84d..f00b2588362 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/api_client.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/api_client.py
@@ -674,12 +674,12 @@ def deserialize(
             """
             if cls.style:
                 extracted_data = cls._deserialize_simple(in_data, name, cls.explode, False)
-                return schema.from_openapi_data_oapg(extracted_data)
+                return schema.from_openapi_data_(extracted_data)
         # cls.content will be length one
         for content_type, schema in cls.content.items():
             if cls._content_type_is_json(content_type):
                 cast_in_data = json.loads(in_data)
-                return schema.from_openapi_data_oapg(cast_in_data)
+                return schema.from_openapi_data_(cast_in_data)
             raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -757,7 +757,7 @@ class ApiResponseWithoutDeserialization(ApiResponse):
 
 class TypedDictInputVerifier:
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -894,7 +894,7 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
 
         deserialized_headers = schemas.unset
         if cls.headers is not None:
-            cls._verify_typed_dict_inputs_oapg(cls.response_cls.headers, response.headers)
+            cls._verify_typed_dict_inputs(cls.response_cls.headers, response.headers)
             deserialized_headers = {}
             for header_name, header_param in self.headers.items():
                 header_value = response.getheader(header_name)
@@ -927,8 +927,8 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
                 content_type = 'multipart/form-data'
             else:
                 raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
+            deserialized_body = body_schema.from_openapi_data_(
+                body_data, configuration_=configuration)
         elif streamed:
             response.release_conn()
 
@@ -1249,7 +1249,7 @@ def __init__(self, api_client: typing.Optional[ApiClient] = None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def _get_host_oapg(
+    def _get_host(
         self,
         operation_id: str,
         servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.py
index 637761a6dac..1d2c130a04f 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.py
@@ -33,7 +33,7 @@ class AdditionOperator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "a",
@@ -52,18 +52,18 @@ class Properties:
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    a: MetaOapg.Properties.A
-    b: MetaOapg.Properties.B
-    operator_id: MetaOapg.Properties.OperatorId
+    a: Schema_.Properties.A
+    b: Schema_.Properties.B
+    operator_id: Schema_.Properties.OperatorId
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def __getitem__(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
     def __getitem__(
         self,
@@ -77,15 +77,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def get_item_(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def get_item_(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
@@ -93,21 +93,21 @@ def get_item_oapg(
             typing_extensions.Literal["operator_id"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.Properties.B, decimal.Decimal, int, float, ],
-        operator_id: typing.Union[MetaOapg.Properties.OperatorId, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, decimal.Decimal, int, float, ],
+        b: typing.Union[Schema_.Properties.B, decimal.Decimal, int, float, ],
+        operator_id: typing.Union[Schema_.Properties.OperatorId, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AdditionOperator':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
             b=b,
             operator_id=operator_id,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.pyi b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.pyi
index 6ee186f7d8f..bf808c73862 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.pyi
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/addition_operator.pyi
@@ -33,7 +33,7 @@ class AdditionOperator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "a",
             "b",
@@ -51,18 +51,18 @@ class AdditionOperator(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    a: MetaOapg.Properties.A
-    b: MetaOapg.Properties.B
-    operator_id: MetaOapg.Properties.OperatorId
+    a: Schema_.Properties.A
+    b: Schema_.Properties.B
+    operator_id: Schema_.Properties.OperatorId
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def __getitem__(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
     def __getitem__(
         self,
@@ -76,15 +76,15 @@ class AdditionOperator(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def get_item_(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def get_item_(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
@@ -92,21 +92,21 @@ class AdditionOperator(
             typing_extensions.Literal["operator_id"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.Properties.B, decimal.Decimal, int, float, ],
-        operator_id: typing.Union[MetaOapg.Properties.OperatorId, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, decimal.Decimal, int, float, ],
+        b: typing.Union[Schema_.Properties.B, decimal.Decimal, int, float, ],
+        operator_id: typing.Union[Schema_.Properties.OperatorId, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AdditionOperator':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
             b=b,
             operator_id=operator_id,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.py
index fc34b9b4973..8391cfa7a51 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.py
@@ -33,7 +33,7 @@ class Operator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -64,14 +64,14 @@ def one_of1() -> typing.Type['subtraction_operator.SubtractionOperator']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Operator':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.pyi b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.pyi
index fc34b9b4973..8391cfa7a51 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.pyi
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/operator.pyi
@@ -33,7 +33,7 @@ class Operator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -64,14 +64,14 @@ class Operator(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Operator':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.py
index 476e0626b81..96a175d0e95 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.py
@@ -33,7 +33,7 @@ class SubtractionOperator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "a",
@@ -52,18 +52,18 @@ class Properties:
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    a: MetaOapg.Properties.A
-    b: MetaOapg.Properties.B
-    operator_id: MetaOapg.Properties.OperatorId
+    a: Schema_.Properties.A
+    b: Schema_.Properties.B
+    operator_id: Schema_.Properties.OperatorId
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def __getitem__(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
     def __getitem__(
         self,
@@ -77,15 +77,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def get_item_(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def get_item_(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
@@ -93,21 +93,21 @@ def get_item_oapg(
             typing_extensions.Literal["operator_id"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.Properties.B, decimal.Decimal, int, float, ],
-        operator_id: typing.Union[MetaOapg.Properties.OperatorId, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, decimal.Decimal, int, float, ],
+        b: typing.Union[Schema_.Properties.B, decimal.Decimal, int, float, ],
+        operator_id: typing.Union[Schema_.Properties.OperatorId, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'SubtractionOperator':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
             b=b,
             operator_id=operator_id,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.pyi b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.pyi
index 80d4e6ffb0d..9d025c677f1 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.pyi
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/components/schema/subtraction_operator.pyi
@@ -33,7 +33,7 @@ class SubtractionOperator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "a",
             "b",
@@ -51,18 +51,18 @@ class SubtractionOperator(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    a: MetaOapg.Properties.A
-    b: MetaOapg.Properties.B
-    operator_id: MetaOapg.Properties.OperatorId
+    a: Schema_.Properties.A
+    b: Schema_.Properties.B
+    operator_id: Schema_.Properties.OperatorId
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def __getitem__(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def __getitem__(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
     def __getitem__(
         self,
@@ -76,15 +76,15 @@ class SubtractionOperator(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["b"]) -> MetaOapg.Properties.B: ...
+    def get_item_(self, name: typing_extensions.Literal["b"]) -> Schema_.Properties.B: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["operator_id"]) -> MetaOapg.Properties.OperatorId: ...
+    def get_item_(self, name: typing_extensions.Literal["operator_id"]) -> Schema_.Properties.OperatorId: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
@@ -92,21 +92,21 @@ class SubtractionOperator(
             typing_extensions.Literal["operator_id"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, decimal.Decimal, int, float, ],
-        b: typing.Union[MetaOapg.Properties.B, decimal.Decimal, int, float, ],
-        operator_id: typing.Union[MetaOapg.Properties.OperatorId, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, decimal.Decimal, int, float, ],
+        b: typing.Union[Schema_.Properties.B, decimal.Decimal, int, float, ],
+        operator_id: typing.Union[Schema_.Properties.OperatorId, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'SubtractionOperator':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
             b=b,
             operator_id=operator_id,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.py
index d5179cf1192..61316ab444e 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -56,7 +56,7 @@ def _post_operators_oapg(
     ]: ...
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -69,7 +69,7 @@ def _post_operators_oapg(
 
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -79,7 +79,7 @@ def _post_operators_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -91,7 +91,7 @@ def _post_operators_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -209,7 +209,7 @@ def post_operators(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_operators_oapg(
+        return self._post_operators(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -277,7 +277,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_operators_oapg(
+        return self._post_operators(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.pyi b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.pyi
index ae3ed5d4856..9a6d25393cf 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.pyi
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/paths/operators/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _post_operators_oapg(
+    def _post_operators(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.operator.Operator, schemas.Unset] = schemas.unset,
@@ -197,7 +197,7 @@ class PostOperators(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_operators_oapg(
+        return self._post_operators(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -265,7 +265,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._post_operators_oapg(
+        return self._post_operators(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/schemas.py b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/schemas.py
index aa3e8ebc53a..f314e53f24e 100644
--- a/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/schemas.py
+++ b/samples/openapi3/client/features/nonCompliantUseDiscriminatorIfCompositionFails/python/this_package/schemas.py
@@ -46,17 +46,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     """
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
-            if _arg.closed:
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(arg_, (io.FileIO, io.BufferedReader)):
+            if arg_.closed:
                 raise exceptions.ApiValueError('Invalid file state; file is closed and must be open')
-            _arg.close()
-            inst = super(FileIO, cls).__new__(cls, _arg.name)
-            super(FileIO, inst).__init__(_arg.name)
+            arg_.close()
+            inst = super(FileIO, cls).__new__(cls, arg_.name)
+            super(FileIO, inst).__init__(arg_.name)
             return inst
-        raise exceptions.ApiValueError('FileIO must be passed _arg which contains the open file')
+        raise exceptions.ApiValueError('FileIO must be passed arg_ which contains the open file')
 
-    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, arg_: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -150,11 +150,11 @@ def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_t
 class Singleton:
     """
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, _arg)
+    The same instance is returned for a given key of (cls, arg_)
     """
     _instances = {}
 
-    def __new__(cls, _arg: typing.Any, **kwargs):
+    def __new__(cls, arg_: typing.Any, **kwargs):
         """
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -162,15 +162,15 @@ def __new__(cls, _arg: typing.Any, **kwargs):
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of arg_ ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         """
-        key = (cls, _arg, str(_arg))
+        key = (cls, arg_, str(arg_))
         if key not in cls._instances:
-            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(arg_, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, _arg)
+                cls._instances[key] = super().__new__(cls, arg_)
         return cls._instances[key]
 
     def __repr__(self):
@@ -218,7 +218,7 @@ def __bool__(self) -> bool:
         raise ValueError('Unable to find the boolean value of this instance')
 
 
-class MetaOapgTyped:
+class SchemaTyped:
     types: typing.Optional[typing.Set[typing.Type]]
     exclusive_maximum: typing.Union[int, float]
     inclusive_maximum: typing.Union[int, float]
@@ -326,7 +326,7 @@ def validate_enum(
     return None
 
 
-def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+def _raise_validation_error_message(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
     raise exceptions.ApiValueError(
         "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
             value=value,
@@ -348,7 +348,7 @@ def validate_unique_items(
     if not unique_items_value or not isinstance(arg, tuple):
         return None
     if len(arg) > len(set(arg)):
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
             constraint_value='unique_items==True',
@@ -367,7 +367,7 @@ def validate_min_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) < min_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be greater than or equal to",
             constraint_value=min_items,
@@ -386,7 +386,7 @@ def validate_max_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) > max_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be less than or equal to",
             constraint_value=max_items,
@@ -405,7 +405,7 @@ def validate_min_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) < min_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be greater than or equal to",
             constraint_value=min_properties,
@@ -424,7 +424,7 @@ def validate_max_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) > max_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be less than or equal to",
             constraint_value=max_properties,
@@ -443,7 +443,7 @@ def validate_min_length(
     if not isinstance(arg, str):
         return None
     if len(arg) < min_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be greater than or equal to",
             constraint_value=min_length,
@@ -462,7 +462,7 @@ def validate_max_length(
     if not isinstance(arg, str):
         return None
     if len(arg) > max_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be less than or equal to",
             constraint_value=max_length,
@@ -481,7 +481,7 @@ def validate_inclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg < inclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than or equal to",
             constraint_value=inclusive_minimum,
@@ -500,7 +500,7 @@ def validate_exclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg <= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than",
             constraint_value=exclusive_minimum,
@@ -519,7 +519,7 @@ def validate_inclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg > inclusive_maximum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than or equal to",
             constraint_value=inclusive_maximum,
@@ -538,7 +538,7 @@ def validate_exclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg >= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than",
             constraint_value=exclusive_maximum,
@@ -557,7 +557,7 @@ def validate_multiple_of(
         return None
     if (not (float(arg) / multiple_of).is_integer()):
         # Note 'multipleOf' will be as good as the floating point arithmetic.
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="value must be a multiple of",
             constraint_value=multiple_of,
@@ -580,14 +580,14 @@ def validate_regex(
         if flags != 0:
             # Don't print the regex flags if the flags are not
             # specified in the OAS document.
-            _raise_validation_error_message_oapg(
+            _raise_validation_error_message(
                 value=arg,
                 constraint_msg="must match regular expression",
                 constraint_value=regex_dict['pattern'],
                 path_to_item=validation_metadata.path_to_item,
                 additional_txt=" with flags=`{}`".format(flags)
             )
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must match regular expression",
             constraint_value=regex_dict['pattern'],
@@ -772,7 +772,7 @@ def validate_required(
     return None
 
 
-def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+def _get_class(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
     if isinstance(item_cls, types.FunctionType):
         # referenced schema
         return item_cls()
@@ -791,7 +791,7 @@ def validate_items(
 ) -> PathToSchemasType:
     if not isinstance(arg, tuple):
         return None
-    item_cls = _get_class_oapg(item_cls)
+    item_cls = _get_class(item_cls)
     path_to_schemas = {}
     for i, value in enumerate(arg):
         item_validation_metadata = ValidationMetadata(
@@ -802,7 +802,7 @@ def validate_items(
         if item_validation_metadata.validation_ran_earlier(item_cls):
             add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = item_cls._validate_oapg(
+        other_path_to_schemas = item_cls._validate(
             value, validation_metadata=item_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
@@ -822,7 +822,7 @@ def validate_properties(
     for property_name, value in present_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
         schema = properties.__annotations__[property_name]
-        schema = _get_class_oapg(schema)
+        schema = _get_class(schema)
         arg_validation_metadata = ValidationMetadata(
             path_to_item=path_to_item,
             configuration=validation_metadata.configuration,
@@ -831,7 +831,7 @@ def validate_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -845,9 +845,9 @@ def validate_additional_properties(
 ) -> typing.Optional[PathToSchemasType]:
     if not isinstance(arg, frozendict.frozendict):
         return None
-    schema = _get_class_oapg(additional_properties_schema)
+    schema = _get_class(additional_properties_schema)
     path_to_schemas = {}
-    properties_annotations = cls.MetaOapg.Properties.__annotations__ if hasattr(cls.MetaOapg, 'Properties') else {}
+    properties_annotations = cls.Schema_.Properties.__annotations__ if hasattr(cls.Schema_, 'Properties') else {}
     present_additional_properties = {k: v for k, v, in arg.items() if k not in properties_annotations}
     for property_name, value in present_additional_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
@@ -859,7 +859,7 @@ def validate_additional_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -875,14 +875,14 @@ def validate_one_of(
     oneof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for one_of_cls in one_of_container_cls.classes:
-        schema = _get_class_oapg(one_of_cls)
+        schema = _get_class(one_of_cls)
         if schema in path_to_schemas[validation_metadata.path_to_item]:
             oneof_classes.append(schema)
             continue
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             oneof_classes.append(schema)
             continue
@@ -891,7 +891,7 @@ def validate_one_of(
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
         try:
-            path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate oneof_classes
             continue
@@ -933,11 +933,11 @@ def validate_any_of(
     anyof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for any_of_cls in any_of_container_cls.classes:
-        schema = _get_class_oapg(any_of_cls)
+        schema = _get_class(any_of_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             anyof_classes.append(schema)
             continue
@@ -947,7 +947,7 @@ def validate_any_of(
             continue
 
         try:
-            other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate anyof_classes
             continue
@@ -976,17 +976,17 @@ def validate_all_of(
 ) -> PathToSchemasType:
     path_to_schemas = collections.defaultdict(set)
     for allof_cls in all_of_cls.classes:
-        schema = _get_class_oapg(allof_cls)
+        schema = _get_class(allof_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             continue
         if validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -998,7 +998,7 @@ def validate_not(
     validation_metadata: ValidationMetadata,
     **kwargs
 ) -> None:
-    not_schema = _get_class_oapg(not_cls)
+    not_schema = _get_class(not_cls)
     other_path_to_schemas = None
     not_exception = exceptions.ApiValueError(
         "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
@@ -1011,7 +1011,7 @@ def validate_not(
         raise not_exception
 
     try:
-        other_path_to_schemas = not_schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = not_schema._validate(arg, validation_metadata=validation_metadata)
     except (exceptions.ApiValueError, exceptions.ApiTypeError):
         pass
     if other_path_to_schemas:
@@ -1036,38 +1036,38 @@ def __get_discriminated_class(cls, disc_property_name: str, disc_payload_value:
     """
     Used in schemas with discriminators
     """
-    if not hasattr(cls.MetaOapg, 'discriminator'):
+    if not hasattr(cls.Schema_, 'discriminator'):
         return None
-    disc = cls.MetaOapg.discriminator()
+    disc = cls.Schema_.discriminator()
     if disc_property_name not in disc:
         return None
     discriminated_cls = disc[disc_property_name].get(disc_payload_value)
     if discriminated_cls is not None:
         return discriminated_cls
     if not (
-        hasattr(cls.MetaOapg, 'AllOf') or
-        hasattr(cls.MetaOapg, 'OneOf') or
-        hasattr(cls.MetaOapg, 'AnyOf')
+        hasattr(cls.Schema_, 'AllOf') or
+        hasattr(cls.Schema_, 'OneOf') or
+        hasattr(cls.Schema_, 'AnyOf')
     ):
         return None
     # TODO stop traveling if a cycle is hit
-    if hasattr(cls.MetaOapg, 'AllOf'):
-        for allof_cls in cls.MetaOapg.AllOf.classes:
-            allof_cls = _get_class_oapg(allof_cls)
+    if hasattr(cls.Schema_, 'AllOf'):
+        for allof_cls in cls.Schema_.AllOf.classes:
+            allof_cls = _get_class(allof_cls)
             discriminated_cls = __get_discriminated_class(
                 allof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'OneOf'):
-        for oneof_cls in cls.MetaOapg.OneOf.classes:
-            oneof_cls = _get_class_oapg(oneof_cls)
+    if hasattr(cls.Schema_, 'OneOf'):
+        for oneof_cls in cls.Schema_.OneOf.classes:
+            oneof_cls = _get_class(oneof_cls)
             discriminated_cls = __get_discriminated_class(
                 oneof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'AnyOf'):
-        for anyof_cls in cls.MetaOapg.AnyOf.classes:
-            anyof_cls = _get_class_oapg(anyof_cls)
+    if hasattr(cls.Schema_, 'AnyOf'):
+        for anyof_cls in cls.Schema_.AnyOf.classes:
+            anyof_cls = _get_class(anyof_cls)
             discriminated_cls = __get_discriminated_class(
                 anyof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
@@ -1081,7 +1081,7 @@ def _get_discriminated_class_and_exception(
 ) -> typing.Tuple[typing.Optional['Schema'], typing.Optional[Exception]]:
     if not isinstance(arg, frozendict.frozendict):
         return None, None
-    discriminator = cls.MetaOapg.discriminator()
+    discriminator = cls.Schema_.discriminator()
     disc_prop_name = list(discriminator.keys())[0]
     try:
         __ensure_discriminator_value_present(disc_prop_name, validation_metadata, arg)
@@ -1121,7 +1121,7 @@ def validate_discriminator(
     if discriminated_cls is cls:
         """
         Optimistically assume that cls will pass validation
-        If the code invoked _validate_oapg on cls it would infinitely recurse
+        If the code invoked _validate on cls it would infinitely recurse
         """
         return None
     if validation_metadata.validation_ran_earlier(discriminated_cls):
@@ -1134,7 +1134,7 @@ def validate_discriminator(
         seen_classes=validation_metadata.seen_classes | frozenset({cls}),
         validated_path_to_schemas=validation_metadata.validated_path_to_schemas
     )
-    return discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
+    return discriminated_cls._validate(arg, validation_metadata=updated_vm)
 
 
 json_schema_keyword_to_validator = {
@@ -1175,7 +1175,7 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
     __excluded_cls_properties = {
         '__module__',
         '__dict__',
@@ -1184,7 +1184,7 @@ class Schema:
     }
 
     @classmethod
-    def _validate_oapg(
+    def _validate(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
@@ -1196,7 +1196,7 @@ def _validate_oapg(
         """
         json_schema_data = {
             k: v
-            for k, v in vars(cls.MetaOapg).items()
+            for k, v in vars(cls.Schema_).items()
             if k not in cls.__excluded_cls_properties
             and k
             not in validation_metadata.configuration.disabled_json_schema_python_keywords
@@ -1234,7 +1234,7 @@ def _validate_oapg(
         return path_to_schemas
 
     @staticmethod
-    def _process_schema_classes_oapg(
+    def _process_schema_classes(
         schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
     ):
         """
@@ -1283,21 +1283,21 @@ def __get_new_cls(
 
         Dict property + List Item Assignment Use cases:
         1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
+            the value is validated by _validate
+            _validate returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
         2. value is an instance of the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
+            the value is NOT validated by _validate, _validate only checks that the instance is of the correct schema type
+            for this value, _validate does NOT return an entry for it in _path_to_schemas
+            and in list/dict _get_items,_get_properties the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         """
         _path_to_schemas = {}
         if validation_metadata.validation_ran_earlier(cls):
             add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
         else:
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
         # do not modify the returned result because it is cached and we would be modifying the cached value
@@ -1311,9 +1311,9 @@ def __get_new_cls(
                 Singleton already added
             3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
             """
-            cls._process_schema_classes_oapg(schema_classes)
+            cls._process_schema_classes(schema_classes)
             enum_schema = any(
-                issubclass(this_cls, Schema) and hasattr(this_cls.MetaOapg, "enum_value_to_name")
+                issubclass(this_cls, Schema) and hasattr(this_cls.Schema_, "enum_value_to_name")
                 for this_cls in schema_classes
             )
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
@@ -1341,7 +1341,7 @@ def __get_new_cls(
         return path_to_schemas
 
     @classmethod
-    def _get_new_instance_without_conversion_oapg(
+    def _get_new_instance_without_conversion(
         cls,
         arg: typing.Any,
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
@@ -1349,10 +1349,10 @@ def _get_new_instance_without_conversion_oapg(
     ):
         # We have a Dynamic class and we are making an instance of it
         if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
+            properties = cls._get_properties(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, properties)
         elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
+            items = cls._get_items(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, items)
         """
         str = openapi str, datetime.date, and datetime.datetime
@@ -1363,7 +1363,7 @@ def _get_new_instance_without_conversion_oapg(
         return super(Schema, cls).__new__(cls, arg)
 
     @classmethod
-    def from_openapi_data_oapg(
+    def from_openapi_data_(
         cls,
         arg: typing.Union[
             str,
@@ -1377,10 +1377,10 @@ def from_openapi_data_oapg(
             io.BufferedReader,
             bytes
         ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None
+        configuration_: typing.Optional[configuration_module.Configuration] = None
     ):
         """
-        Schema from_openapi_data_oapg
+        Schema from_openapi_data_
         """
         from_server = True
         validated_path_to_schemas = {}
@@ -1388,12 +1388,12 @@ def from_openapi_data_oapg(
         arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas, ('args[0]',), path_to_type)
         validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(validated_path_to_schemas)
         )
         path_to_schemas = cls.__get_new_cls(arg, validation_metadata, path_to_type)
         new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
+        new_inst = new_cls._get_new_instance_without_conversion(
             arg,
             validation_metadata.path_to_item,
             path_to_schemas
@@ -1415,7 +1415,7 @@ def __remove_unsets(kwargs):
 
     def __new__(
         cls,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict,
             frozendict.frozendict,
             list,
@@ -1433,7 +1433,7 @@ def __new__(
             io.FileIO,
             io.BufferedReader,
             'Schema',        ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict,
             frozendict.frozendict,
@@ -1458,23 +1458,23 @@ def __new__(
         Schema __new__
 
         Args:
-            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            args_ (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the configuration_module.Configuration that enables json schema validation keywords
+            configuration_: contains the configuration_module.Configuration that enables json schema validation keywords
                 like minItems, minLength etc
 
         Note: double underscores are used here because pycharm thinks that these variables
         are instance properties if they are named normally :(
         """
         __kwargs = cls.__remove_unsets(kwargs)
-        if not _args and not __kwargs:
+        if not args_ and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and _args and not isinstance(_args[0], dict):
-            __arg = _args[0]
+        if not __kwargs and args_ and not isinstance(args_[0], dict):
+            __arg = args_[0]
         else:
-            __arg = cls.__get_input_dict(*_args, **__kwargs)
+            __arg = cls.__get_input_dict(*args_, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __path_to_type = {}
@@ -1482,12 +1482,12 @@ def __new__(
             __arg, __from_server, __validated_path_to_schemas, ('args[0]',), __path_to_type)
         __validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(__validated_path_to_schemas)
         )
         __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata, __path_to_type)
         __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
+        return __new_cls._get_new_instance_without_conversion(
             __arg,
             __validation_metadata.path_to_item,
             __path_to_schemas
@@ -1495,9 +1495,9 @@ def __new__(
 
     def __init__(
         self,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
@@ -1808,7 +1808,7 @@ class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
 
 
 class BoolBase:
-    def is_true_oapg(self) -> bool:
+    def is_true_(self) -> bool:
         """
         A replacement for x is True
         True if the instance is a BoolClass True Singleton
@@ -1817,7 +1817,7 @@ def is_true_oapg(self) -> bool:
             return False
         return bool(self)
 
-    def is_false_oapg(self) -> bool:
+    def is_false_(self) -> bool:
         """
         A replacement for x is False
         True if the instance is a BoolClass False Singleton
@@ -1828,7 +1828,7 @@ def is_false_oapg(self) -> bool:
 
 
 class NoneBase:
-    def is_none_oapg(self) -> bool:
+    def is_none_(self) -> bool:
         """
         A replacement for x is None
         True if the instance is a NoneClass None Singleton
@@ -1839,47 +1839,47 @@ def is_none_oapg(self) -> bool:
 
 
 class StrBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_str_oapg(self) -> str:
+    def as_str_(self) -> str:
         return self
 
     @property
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         raise Exception('not implemented')
 
     @property
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         raise Exception('not implemented')
 
     @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         raise Exception('not implemented')
 
     @property
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         raise Exception('not implemented')
 
 
 class UUIDBase:
     @property
     @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         return uuid.UUID(self)
 
 
 class DateBase:
     @property
     @functools.lru_cache()
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
 
 class DateTimeBase:
     @property
     @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
 
@@ -1892,15 +1892,15 @@ class DecimalBase:
 
     @property
     @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
 
 class NumberBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -1920,7 +1920,7 @@ def as_int_oapg(self) -> int:
             return self._as_int
 
     @property
-    def as_float_oapg(self) -> float:
+    def as_float_(self) -> float:
         try:
             return self._as_float
         except AttributeError:
@@ -1931,24 +1931,24 @@ def as_float_oapg(self) -> float:
 
 
 class ListBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @classmethod
-    def _get_items_oapg(
+    def _get_items(
         cls: 'Schema',
         arg: typing.List[typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         '''
-        ListBase _get_items_oapg
+        ListBase _get_items
         '''
         cast_items = []
 
         for i, value in enumerate(arg):
             item_path_to_item = path_to_item + (i,)
             item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
+            new_value = item_cls._get_new_instance_without_conversion(
                 value,
                 item_path_to_item,
                 path_to_schemas
@@ -1960,14 +1960,14 @@ def _get_items_oapg(
 
 class DictBase:
     @classmethod
-    def _get_properties_oapg(
+    def _get_properties(
         cls,
         arg: typing.Dict[str, typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         """
-        DictBase _get_properties_oapg, this is how properties are set
+        DictBase _get_properties, this is how properties are set
         These values already passed validation
         """
         dict_items = {}
@@ -1975,7 +1975,7 @@ def _get_properties_oapg(
         for property_name_js, value in arg.items():
             property_path_to_item = path_to_item + (property_name_js,)
             property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
+            new_value = property_cls._get_new_instance_without_conversion(
                 value,
                 property_path_to_item,
                 path_to_schemas
@@ -2004,7 +2004,7 @@ def __getattr__(self, name: str):
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+    def get_item_(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
         # dict_instance[name] accessor
         if not isinstance(self, frozendict.frozendict):
             raise NotImplementedError()
@@ -2161,15 +2161,15 @@ class ListSchema(
     Schema,
     TupleMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.List[typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NoneSchema(
@@ -2177,15 +2177,15 @@ class NoneSchema(
     Schema,
     NoneMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: None, **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: None, **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NumberSchema(
@@ -2197,20 +2197,20 @@ class NumberSchema(
     This is used for type: number with no format
     Both integers AND floats are accepted
     """
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Union[int, float], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class IntBase:
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -2219,22 +2219,22 @@ def as_int_oapg(self) -> int:
 
 
 class IntSchema(IntBase, NumberSchema):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: int, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class Int32Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int32'
 
@@ -2242,7 +2242,7 @@ class MetaOapg:
 class Int64Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int64'
 
@@ -2250,25 +2250,25 @@ class MetaOapg:
 class Float32Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'float'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class Float64Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'double'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class StrSchema(
@@ -2282,50 +2282,50 @@ class StrSchema(
     - type: string (format unset)
     - type: string, format: date
     """
-    class MetaOapg:
+    class Schema_:
         types = {str}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'number'
 
-    def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
+    def __new__(cls, arg_: str, **kwargs: configuration_module.Configuration):
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2334,7 +2334,7 @@ def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         """
-        return super().__new__(cls, _arg, **kwargs)
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class BytesSchema(
@@ -2344,11 +2344,11 @@ class BytesSchema(
     """
     this class will subclass bytes and is immutable
     """
-    class MetaOapg:
+    class Schema_:
         types = {bytes}
 
-    def __new__(cls, _arg: bytes, **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: bytes, **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class FileSchema(
@@ -2371,18 +2371,18 @@ class FileSchema(
     - to allow file reading and writing to disk
     - to be able to preserve file name info
     """
-    class MetaOapg:
+    class Schema_:
         types = {FileIO}
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class BinarySchema(
     Schema,
     BinaryMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {FileIO, bytes}
         format = 'binary'
 
@@ -2392,8 +2392,8 @@ class OneOf:
                 FileSchema,
             ]
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_)
 
 
 class BoolSchema(
@@ -2401,15 +2401,15 @@ class BoolSchema(
     Schema,
     BoolMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {BoolClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: bool, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class AnyTypeSchema(
@@ -2423,7 +2423,7 @@ class AnyTypeSchema(
     NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
-    class MetaOapg:
+    class Schema_:
         pass
 
 
@@ -2439,18 +2439,18 @@ class NotAnyTypeSchema(AnyTypeSchema):
     Note: validations on this class are never run because the code knows that no inputs will ever validate
     """
 
-    class MetaOapg:
+    class Schema_:
         _not = AnyTypeSchema
 
     def __new__(
         cls,
-        *_args,
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        *args_,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
 
 
@@ -2459,15 +2459,15 @@ class DictSchema(
     Schema,
     FrozenDictMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *_args, **kwargs)
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
+        return super().__new__(cls, *args_, **kwargs)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
diff --git a/samples/openapi3/client/petstore/python/README.md b/samples/openapi3/client/petstore/python/README.md
index e518d3a46be..24bd37ad168 100644
--- a/samples/openapi3/client/petstore/python/README.md
+++ b/samples/openapi3/client/petstore/python/README.md
@@ -27,25 +27,25 @@ Python &gt;&#x3D;3.7
         - ingested None will subclass NoneClass
         - ingested True will subclass BoolClass
         - ingested False will subclass BoolClass
-        - So if you need to check is True/False/None, instead use instance.is_true_oapg()/.is_false_oapg()/.is_none_oapg()
+        - So if you need to check is True/False/None, instead use instance.is_true_()/.is_false_()/.is_none_()
 5. All validated class instances are immutable except for ones based on io.File
     - This is because if properties were changed after validation, that validation would no longer apply
     - So no changing values or property values after a class has been instantiated
 6. String + Number types with formats
     - String type data is stored as a string and if you need to access types based on its format like date,
     date-time, uuid, number etc then you will need to use accessor functions on the instance
-    - type string + format: See .as_date_oapg, .as_datetime_oapg, .as_decimal_oapg, .as_uuid_oapg
-    - type number + format: See .as_float_oapg, .as_int_oapg
+    - type string + format: See .as_date_, .as_datetime_, .as_decimal_, .as_uuid_
+    - type number + format: See .as_float_, .as_int_
     - this was done because openapi/json-schema defines constraints. string data may be type string with no format
     keyword in one schema, and include a format constraint in another schema
-    - So if you need to access a string format based type, use as_date_oapg/as_datetime_oapg/as_decimal_oapg/as_uuid_oapg
-    - So if you need to access a number format based type, use as_int_oapg/as_float_oapg
+    - So if you need to access a string format based type, use as_date_/as_datetime_/as_decimal_/as_uuid_
+    - So if you need to access a number format based type, use as_int_/as_float_
 7. Property access on AnyType(type unset) or object(dict) schemas
     - Only required keys with valid python names are properties like .someProp and have type hints
     - All optional keys may not exist, so properties are not defined for them
     - One can access optional values with dict_instance['optionalProp'] and KeyError will be raised if it does not exist
-    - Use get_item_oapg if you need a way to always get a value whether or not the key exists
-        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_oapg('optionalProp')
+    - Use get_item_ if you need a way to always get a value whether or not the key exists
+        - If the key does not exist, schemas.unset is returned from calling dict_instance.get_item_('optionalProp')
         - All required and optional keys have type hints for this method, and @typing.overload is used
         - A type hint is also generated for additionalProperties accessed using this method
     - So you will need to update you code to use some_instance['optionalProp'] to access optional property
@@ -61,19 +61,18 @@ Python &gt;&#x3D;3.7
     - Those apis will only load their needed models, which is less to load than all of the resources needed in a tag api
     - So you will need to update your import paths to the api classes
 
-### Why are Oapg and _oapg used in class and method names?
+### Why are Leading and Trailing Underscores in class and method names?
 Classes can have arbitrarily named properties set on them
 Endpoints can have arbitrary operationId method names set
-For those reasons, I use the prefix Oapg and _oapg to greatly reduce the likelihood of collisions
+For those reasons, I use the prefix and suffix _ to greatly reduce the likelihood of collisions
 on protected + public classes/methods.
-oapg stands for OpenApi Python Generator.
 
 ### Object property spec case
 This was done because when payloads are ingested, they can be validated against N number of schemas.
 If the input signature used a different property name then that has mutated the payload.
 So SchemaA and SchemaB must both see the camelCase spec named variable.
 Also it is possible to send in two properties, named camelCase and camel_case in the same payload.
-That use case should be support so spec case is used.
+That use case should work, so spec case is used.
 
 ### Parameter spec case
 Parameters can be included in different locations including:
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api_client.py b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
index 5816b092a47..63ca7adfea5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api_client.py
@@ -674,12 +674,12 @@ def deserialize(
             """
             if cls.style:
                 extracted_data = cls._deserialize_simple(in_data, name, cls.explode, False)
-                return schema.from_openapi_data_oapg(extracted_data)
+                return schema.from_openapi_data_(extracted_data)
         # cls.content will be length one
         for content_type, schema in cls.content.items():
             if cls._content_type_is_json(content_type):
                 cast_in_data = json.loads(in_data)
-                return schema.from_openapi_data_oapg(cast_in_data)
+                return schema.from_openapi_data_(cast_in_data)
             raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
 
 
@@ -757,7 +757,7 @@ class ApiResponseWithoutDeserialization(ApiResponse):
 
 class TypedDictInputVerifier:
     @staticmethod
-    def _verify_typed_dict_inputs_oapg(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
+    def _verify_typed_dict_inputs(cls: typing.Type[typing_extensions.TypedDict], data: typing.Dict[str, typing.Any]):
         """
         Ensures that:
         - required keys are present
@@ -894,7 +894,7 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
 
         deserialized_headers = schemas.unset
         if cls.headers is not None:
-            cls._verify_typed_dict_inputs_oapg(cls.response_cls.headers, response.headers)
+            cls._verify_typed_dict_inputs(cls.response_cls.headers, response.headers)
             deserialized_headers = {}
             for header_name, header_param in self.headers.items():
                 header_value = response.getheader(header_name)
@@ -927,8 +927,8 @@ def deserialize(cls, response: urllib3.HTTPResponse, configuration: configuratio
                 content_type = 'multipart/form-data'
             else:
                 raise NotImplementedError('Deserialization of {} has not yet been implemented'.format(content_type))
-            deserialized_body = body_schema.from_openapi_data_oapg(
-                body_data, _configuration=configuration)
+            deserialized_body = body_schema.from_openapi_data_(
+                body_data, configuration_=configuration)
         elif streamed:
             response.release_conn()
 
@@ -1258,7 +1258,7 @@ def __init__(self, api_client: typing.Optional[ApiClient] = None):
             api_client = ApiClient()
         self.api_client = api_client
 
-    def _get_host_oapg(
+    def _get_host(
         self,
         operation_id: str,
         servers: typing.Tuple[typing.Dict[str, str], ...] = tuple(),
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.py
index bf4e3166c76..7845783962f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ def items() -> typing.Type['user.User']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['user.User'], typing.List['user.User']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['user.User'], typing.List['user.User']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'user.User':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.pyi
index bf4e3166c76..7845783962f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/request_bodies/request_body_user_array/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ class ApplicationJson(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['user.User'], typing.List['user.User']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['user.User'], typing.List['user.User']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'user.User':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.py
index 08ea8090509..6fb56fd9214 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.py
@@ -28,26 +28,26 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         AdditionalProperties = schemas.Int32Schema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, decimal.Decimal, int, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, decimal.Decimal, int, ],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.pyi
index 43ab102a27f..f3d28365667 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/responses/response_success_inline_content_and_header/application_json.pyi
@@ -28,25 +28,25 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         AdditionalProperties = schemas.Int32Schema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, decimal.Decimal, int, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, decimal.Decimal, int, ],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.py
index f6f8a7632d8..da083702d6d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.py
@@ -35,7 +35,7 @@ class _200Response(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -48,10 +48,10 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["class"]) -> MetaOapg.Properties._Class: ...
+    def __getitem__(self, name: typing_extensions.Literal["class"]) -> Schema_.Properties._Class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -68,15 +68,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["class"]) -> typing.Union[MetaOapg.Properties._Class, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["class"]) -> typing.Union[Schema_.Properties._Class, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -84,19 +84,19 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        name: typing.Union[MetaOapg.Properties.Name, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        name: typing.Union[Schema_.Properties.Name, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_200Response':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.pyi
index f6f8a7632d8..da083702d6d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_200_response.pyi
@@ -35,7 +35,7 @@ class _200Response(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -48,10 +48,10 @@ class _200Response(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["class"]) -> MetaOapg.Properties._Class: ...
+    def __getitem__(self, name: typing_extensions.Literal["class"]) -> Schema_.Properties._Class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -68,15 +68,15 @@ class _200Response(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["class"]) -> typing.Union[MetaOapg.Properties._Class, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["class"]) -> typing.Union[Schema_.Properties._Class, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -84,19 +84,19 @@ class _200Response(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        name: typing.Union[MetaOapg.Properties.Name, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        name: typing.Union[Schema_.Properties.Name, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_200Response':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.py
index 8e4c924ec6a..3dfb1597dbf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.py
@@ -35,7 +35,7 @@ class _Return(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,7 +46,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["return"]) -> MetaOapg.Properties._Return: ...
+    def __getitem__(self, name: typing_extensions.Literal["return"]) -> Schema_.Properties._Return: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -62,29 +62,29 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["return"]) -> typing.Union[MetaOapg.Properties._Return, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["return"]) -> typing.Union[Schema_.Properties._Return, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["return"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_Return':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.pyi
index 8e4c924ec6a..3dfb1597dbf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/_return.pyi
@@ -35,7 +35,7 @@ class _Return(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,7 +46,7 @@ class _Return(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["return"]) -> MetaOapg.Properties._Return: ...
+    def __getitem__(self, name: typing_extensions.Literal["return"]) -> Schema_.Properties._Return: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -62,29 +62,29 @@ class _Return(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["return"]) -> typing.Union[MetaOapg.Properties._Return, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["return"]) -> typing.Union[Schema_.Properties._Return, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["return"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> '_Return':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.py
index 5bac4f872a0..c3f83035300 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.py
@@ -35,7 +35,7 @@ class AbstractStepMessage(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -70,14 +70,14 @@ def any_of0() -> typing.Type['AbstractStepMessage']:
 
     
     description: schemas.AnyTypeSchema
-    discriminator: MetaOapg.Properties.Discriminator
+    discriminator: Schema_.Properties.Discriminator
     sequenceNumber: schemas.AnyTypeSchema
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.Properties.Discriminator: ...
+    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> Schema_.Properties.Discriminator: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
@@ -98,18 +98,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.Properties.Discriminator: ...
+    def get_item_(self, name: typing_extensions.Literal["discriminator"]) -> Schema_.Properties.Discriminator: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["description"],
@@ -118,23 +118,23 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         description: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        discriminator: typing.Union[MetaOapg.Properties.Discriminator, str, ],
+        discriminator: typing.Union[Schema_.Properties.Discriminator, str, ],
         sequenceNumber: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AbstractStepMessage':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             description=description,
             discriminator=discriminator,
             sequenceNumber=sequenceNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.pyi
index 5bac4f872a0..c3f83035300 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/abstract_step_message.pyi
@@ -35,7 +35,7 @@ class AbstractStepMessage(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -70,14 +70,14 @@ class AbstractStepMessage(
 
     
     description: schemas.AnyTypeSchema
-    discriminator: MetaOapg.Properties.Discriminator
+    discriminator: Schema_.Properties.Discriminator
     sequenceNumber: schemas.AnyTypeSchema
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.Properties.Discriminator: ...
+    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> Schema_.Properties.Discriminator: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
@@ -98,18 +98,18 @@ class AbstractStepMessage(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["description"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.Properties.Discriminator: ...
+    def get_item_(self, name: typing_extensions.Literal["discriminator"]) -> Schema_.Properties.Discriminator: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["sequenceNumber"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["description"],
@@ -118,23 +118,23 @@ class AbstractStepMessage(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         description: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        discriminator: typing.Union[MetaOapg.Properties.Discriminator, str, ],
+        discriminator: typing.Union[Schema_.Properties.Discriminator, str, ],
         sequenceNumber: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AbstractStepMessage':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             description=description,
             discriminator=discriminator,
             sequenceNumber=sequenceNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.py
index 7f5cb43b79c..ee44d9a0fb1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.py
@@ -33,7 +33,7 @@ class AdditionalPropertiesClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,27 +44,27 @@ class MapProperty(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.StrSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapProperty':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -74,7 +74,7 @@ class MapOfMapProperty(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -83,47 +83,47 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {frozendict.frozendict}
                             AdditionalProperties = schemas.StrSchema
                         
-                        def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                        def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
-                        def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                            return super().get_item_oapg(name)
+                        def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                            return super().get_item_(name)
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                            *args_: typing.Union[dict, frozendict.frozendict, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'MapOfMapProperty':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             Anytype1 = schemas.AnyTypeSchema
@@ -136,27 +136,27 @@ class MapWithUndeclaredPropertiesAnytype3(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.AnyTypeSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'MapWithUndeclaredPropertiesAnytype3':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -166,19 +166,19 @@ class EmptyMap(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.NotAnyTypeSchema
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'EmptyMap':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -187,27 +187,27 @@ class MapWithUndeclaredPropertiesString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.StrSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapWithUndeclaredPropertiesString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -222,28 +222,28 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> MetaOapg.Properties.MapProperty: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> Schema_.Properties.MapProperty: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> MetaOapg.Properties.MapOfMapProperty: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> Schema_.Properties.MapOfMapProperty: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> MetaOapg.Properties.Anytype1: ...
+    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> Schema_.Properties.Anytype1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> MetaOapg.Properties.EmptyMap: ...
+    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> Schema_.Properties.EmptyMap: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> Schema_.Properties.MapWithUndeclaredPropertiesString: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -266,33 +266,33 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[MetaOapg.Properties.MapProperty, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[Schema_.Properties.MapProperty, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.Properties.MapOfMapProperty, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[Schema_.Properties.MapOfMapProperty, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[MetaOapg.Properties.Anytype1, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[Schema_.Properties.Anytype1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype2, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype3, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[MetaOapg.Properties.EmptyMap, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[Schema_.Properties.EmptyMap, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["map_property"],
@@ -306,25 +306,25 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        map_property: typing.Union[MetaOapg.Properties.MapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_of_map_property: typing.Union[MetaOapg.Properties.MapOfMapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        anytype_1: typing.Union[MetaOapg.Properties.Anytype1, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_1: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_2: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_3: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        empty_map: typing.Union[MetaOapg.Properties.EmptyMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_string: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        map_property: typing.Union[Schema_.Properties.MapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_of_map_property: typing.Union[Schema_.Properties.MapOfMapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        anytype_1: typing.Union[Schema_.Properties.Anytype1, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_1: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype1, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_2: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype2, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_3: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype3, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        empty_map: typing.Union[Schema_.Properties.EmptyMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_string: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             map_property=map_property,
             map_of_map_property=map_of_map_property,
             anytype_1=anytype_1,
@@ -333,6 +333,6 @@ def __new__(
             map_with_undeclared_properties_anytype_3=map_with_undeclared_properties_anytype_3,
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.pyi
index 6a78b3954b8..225f6e9d789 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_class.pyi
@@ -33,7 +33,7 @@ class AdditionalPropertiesClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,26 +43,26 @@ class AdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.StrSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapProperty':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -72,7 +72,7 @@ class AdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -80,46 +80,46 @@ class AdditionalPropertiesClass(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             AdditionalProperties = schemas.StrSchema
                         
-                        def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                        def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
-                        def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                            return super().get_item_oapg(name)
+                        def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                            return super().get_item_(name)
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                            *args_: typing.Union[dict, frozendict.frozendict, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'MapOfMapProperty':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             Anytype1 = schemas.AnyTypeSchema
@@ -132,26 +132,26 @@ class AdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.AnyTypeSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'MapWithUndeclaredPropertiesAnytype3':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -161,18 +161,18 @@ class AdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.NotAnyTypeSchema
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'EmptyMap':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -181,26 +181,26 @@ class AdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.StrSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapWithUndeclaredPropertiesString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -215,28 +215,28 @@ class AdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> MetaOapg.Properties.MapProperty: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_property"]) -> Schema_.Properties.MapProperty: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> MetaOapg.Properties.MapOfMapProperty: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_map_property"]) -> Schema_.Properties.MapOfMapProperty: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> MetaOapg.Properties.Anytype1: ...
+    def __getitem__(self, name: typing_extensions.Literal["anytype_1"]) -> Schema_.Properties.Anytype1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype1: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype2: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> Schema_.Properties.MapWithUndeclaredPropertiesAnytype3: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> MetaOapg.Properties.EmptyMap: ...
+    def __getitem__(self, name: typing_extensions.Literal["empty_map"]) -> Schema_.Properties.EmptyMap: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> MetaOapg.Properties.MapWithUndeclaredPropertiesString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> Schema_.Properties.MapWithUndeclaredPropertiesString: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -259,33 +259,33 @@ class AdditionalPropertiesClass(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[MetaOapg.Properties.MapProperty, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_property"]) -> typing.Union[Schema_.Properties.MapProperty, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[MetaOapg.Properties.MapOfMapProperty, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_of_map_property"]) -> typing.Union[Schema_.Properties.MapOfMapProperty, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[MetaOapg.Properties.Anytype1, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anytype_1"]) -> typing.Union[Schema_.Properties.Anytype1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_1"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype1, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_2"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype2, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_anytype_3"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype3, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[MetaOapg.Properties.EmptyMap, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["empty_map"]) -> typing.Union[Schema_.Properties.EmptyMap, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_with_undeclared_properties_string"]) -> typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["map_property"],
@@ -299,25 +299,25 @@ class AdditionalPropertiesClass(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        map_property: typing.Union[MetaOapg.Properties.MapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_of_map_property: typing.Union[MetaOapg.Properties.MapOfMapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        anytype_1: typing.Union[MetaOapg.Properties.Anytype1, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_1: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype1, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_2: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype2, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_anytype_3: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesAnytype3, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        empty_map: typing.Union[MetaOapg.Properties.EmptyMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_with_undeclared_properties_string: typing.Union[MetaOapg.Properties.MapWithUndeclaredPropertiesString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        map_property: typing.Union[Schema_.Properties.MapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_of_map_property: typing.Union[Schema_.Properties.MapOfMapProperty, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        anytype_1: typing.Union[Schema_.Properties.Anytype1, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_1: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype1, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_2: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype2, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_anytype_3: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesAnytype3, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        empty_map: typing.Union[Schema_.Properties.EmptyMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_with_undeclared_properties_string: typing.Union[Schema_.Properties.MapWithUndeclaredPropertiesString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalPropertiesClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             map_property=map_property,
             map_of_map_property=map_of_map_property,
             anytype_1=anytype_1,
@@ -326,6 +326,6 @@ class AdditionalPropertiesClass(
             map_with_undeclared_properties_anytype_3=map_with_undeclared_properties_anytype_3,
             empty_map=empty_map,
             map_with_undeclared_properties_string=map_with_undeclared_properties_string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.py
index d15afde2aa1..186ac21b9fe 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.py
@@ -33,7 +33,7 @@ class AdditionalPropertiesValidator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -46,27 +46,27 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.AnyTypeSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -76,7 +76,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -85,41 +85,41 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             # any type
                             min_length = 3
                     
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -129,7 +129,7 @@ class AllOf2(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -138,41 +138,41 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             # any type
                             max_length = 5
                     
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf2':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -184,13 +184,13 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalPropertiesValidator':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.pyi
index bd58e78e9e0..3e61add04c0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_validator.pyi
@@ -33,7 +33,7 @@ class AdditionalPropertiesValidator(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -46,26 +46,26 @@ class AdditionalPropertiesValidator(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.AnyTypeSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf0':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -75,7 +75,7 @@ class AdditionalPropertiesValidator(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -83,40 +83,40 @@ class AdditionalPropertiesValidator(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             # any type
                     
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -126,7 +126,7 @@ class AdditionalPropertiesValidator(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -134,40 +134,40 @@ class AdditionalPropertiesValidator(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             # any type
                     
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
                 ) -> 'AllOf2':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -179,13 +179,13 @@ class AdditionalPropertiesValidator(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AdditionalPropertiesValidator':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.py
index 1979cfdcd58..39972fad401 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.py
@@ -33,7 +33,7 @@ class AdditionalPropertiesWithArrayOfEnums(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         
@@ -42,7 +42,7 @@ class AdditionalProperties(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {tuple}
                 
                 @staticmethod
@@ -51,35 +51,35 @@ def items() -> typing.Type['enum_class.EnumClass']:
         
             def __new__(
                 cls,
-                _arg: typing.Union[typing.Tuple['enum_class.EnumClass'], typing.List['enum_class.EnumClass']],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                arg_: typing.Union[typing.Tuple['enum_class.EnumClass'], typing.List['enum_class.EnumClass']],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
             ) -> 'AdditionalProperties':
                 return super().__new__(
                     cls,
-                    _arg,
-                    _configuration=_configuration,
+                    arg_,
+                    configuration_=configuration_,
                 )
         
             def __getitem__(self, i: int) -> 'enum_class.EnumClass':
                 return super().__getitem__(i)
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, list, tuple, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, list, tuple, ],
     ) -> 'AdditionalPropertiesWithArrayOfEnums':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.pyi
index 6cd1d012abd..22e20b5be1f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/additional_properties_with_array_of_enums.pyi
@@ -33,7 +33,7 @@ class AdditionalPropertiesWithArrayOfEnums(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         
         class AdditionalProperties(
@@ -41,7 +41,7 @@ class AdditionalPropertiesWithArrayOfEnums(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {tuple}
                 
                 @staticmethod
@@ -50,35 +50,35 @@ class AdditionalPropertiesWithArrayOfEnums(
         
             def __new__(
                 cls,
-                _arg: typing.Union[typing.Tuple['enum_class.EnumClass'], typing.List['enum_class.EnumClass']],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                arg_: typing.Union[typing.Tuple['enum_class.EnumClass'], typing.List['enum_class.EnumClass']],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
             ) -> 'AdditionalProperties':
                 return super().__new__(
                     cls,
-                    _arg,
-                    _configuration=_configuration,
+                    arg_,
+                    configuration_=configuration_,
                 )
         
             def __getitem__(self, i: int) -> 'enum_class.EnumClass':
                 return super().__getitem__(i)
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, list, tuple, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, list, tuple, ],
     ) -> 'AdditionalPropertiesWithArrayOfEnums':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.py
index f1b26b64df9..4ec6b2f4ed9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.py
@@ -33,26 +33,26 @@ class Address(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         AdditionalProperties = schemas.IntSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, decimal.Decimal, int, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, decimal.Decimal, int, ],
     ) -> 'Address':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.pyi
index 16182d0d6b3..c0ffd64dbf5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/address.pyi
@@ -33,25 +33,25 @@ class Address(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         AdditionalProperties = schemas.IntSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, decimal.Decimal, int, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, decimal.Decimal, int, ],
     ) -> 'Address':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.py
index 3cca15976ec..3023e3fdf95 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.py
@@ -33,7 +33,7 @@ class Animal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "className",
@@ -56,13 +56,13 @@ class Properties:
                 "color": Color,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -79,15 +79,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -95,22 +95,22 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Animal':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.pyi
index 74b07464baa..6c73642fd25 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal.pyi
@@ -33,7 +33,7 @@ class Animal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "className",
         }
@@ -55,13 +55,13 @@ class Animal(
                 "color": Color,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -78,15 +78,15 @@ class Animal(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -94,22 +94,22 @@ class Animal(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Animal':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.py
index 2299ea27b78..c850c6255b3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.py
@@ -33,7 +33,7 @@ class AnimalFarm(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ def items() -> typing.Type['animal.Animal']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['animal.Animal'], typing.List['animal.Animal']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['animal.Animal'], typing.List['animal.Animal']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AnimalFarm':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'animal.Animal':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.pyi
index 2299ea27b78..c850c6255b3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/animal_farm.pyi
@@ -33,7 +33,7 @@ class AnimalFarm(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ class AnimalFarm(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['animal.Animal'], typing.List['animal.Animal']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['animal.Animal'], typing.List['animal.Animal']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AnimalFarm':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'animal.Animal':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.py
index bbcfe1ddd7e..ffd838554ee 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.py
@@ -33,7 +33,7 @@ class AnyTypeAndFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,21 +45,21 @@ class Uuid(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'uuid'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Uuid':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -70,21 +70,21 @@ class Date(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'date'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Date':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -95,21 +95,21 @@ class DateTime(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'date-time'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'DateTime':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -120,21 +120,21 @@ class Number(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'number'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Number':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -144,21 +144,21 @@ class Binary(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'binary'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Binary':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -168,21 +168,21 @@ class Int32(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'int32'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Int32':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -192,21 +192,21 @@ class Int64(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'int64'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Int64':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -216,21 +216,21 @@ class Double(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'double'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Double':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -240,21 +240,21 @@ class _Float(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'float'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> '_Float':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -270,31 +270,31 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -318,36 +318,36 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.Properties.Date, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> typing.Union[Schema_.Properties.Date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> typing.Union[MetaOapg.Properties.Number, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> typing.Union[Schema_.Properties.Number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.Properties.Double, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> typing.Union[Schema_.Properties.Double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["uuid"],
@@ -362,24 +362,24 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        uuid: typing.Union[MetaOapg.Properties.Uuid, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        date: typing.Union[MetaOapg.Properties.Date, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        number: typing.Union[MetaOapg.Properties.Number, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        double: typing.Union[MetaOapg.Properties.Double, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        uuid: typing.Union[Schema_.Properties.Uuid, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        date: typing.Union[Schema_.Properties.Date, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        number: typing.Union[Schema_.Properties.Number, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        double: typing.Union[Schema_.Properties.Double, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyTypeAndFormat':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             uuid=uuid,
             date=date,
             number=number,
@@ -387,6 +387,6 @@ def __new__(
             int32=int32,
             int64=int64,
             double=double,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.pyi
index 53a0ef42ecd..ac245d54c76 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_and_format.pyi
@@ -33,7 +33,7 @@ class AnyTypeAndFormat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -44,21 +44,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'uuid'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Uuid':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -69,21 +69,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'date'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Date':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -94,21 +94,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'date-time'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'DateTime':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -119,21 +119,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'number'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Number':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -143,21 +143,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'binary'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Binary':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -167,21 +167,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'int32'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Int32':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -191,21 +191,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'int64'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Int64':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -215,21 +215,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'double'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'Double':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -239,21 +239,21 @@ class AnyTypeAndFormat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     format = 'float'
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> '_Float':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -269,31 +269,31 @@ class AnyTypeAndFormat(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["date-time"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -317,36 +317,36 @@ class AnyTypeAndFormat(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.Properties.Date, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> typing.Union[Schema_.Properties.Date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date-time"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> typing.Union[MetaOapg.Properties.Number, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> typing.Union[Schema_.Properties.Number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.Properties.Double, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> typing.Union[Schema_.Properties.Double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["uuid"],
@@ -361,24 +361,24 @@ class AnyTypeAndFormat(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        uuid: typing.Union[MetaOapg.Properties.Uuid, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        date: typing.Union[MetaOapg.Properties.Date, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        number: typing.Union[MetaOapg.Properties.Number, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        double: typing.Union[MetaOapg.Properties.Double, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        uuid: typing.Union[Schema_.Properties.Uuid, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        date: typing.Union[Schema_.Properties.Date, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        number: typing.Union[Schema_.Properties.Number, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        double: typing.Union[Schema_.Properties.Double, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyTypeAndFormat':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             uuid=uuid,
             date=date,
             number=number,
@@ -386,6 +386,6 @@ class AnyTypeAndFormat(
             int32=int32,
             int64=int64,
             double=double,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.py
index e380ed0088b..b7153094d9c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.py
@@ -33,20 +33,20 @@ class AnyTypeNotString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         _Not = schemas.StrSchema
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.pyi
index e380ed0088b..b7153094d9c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/any_type_not_string.pyi
@@ -33,20 +33,20 @@ class AnyTypeNotString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         _Not = schemas.StrSchema
 
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'AnyTypeNotString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.py
index fde689f8ce9..1b15bf09a67 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.py
@@ -33,7 +33,7 @@ class ApiResponse(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -47,13 +47,13 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["code"]) -> MetaOapg.Properties.Code: ...
+    def __getitem__(self, name: typing_extensions.Literal["code"]) -> Schema_.Properties.Code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.Properties.Type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> Schema_.Properties.Type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.Properties.Message: ...
+    def __getitem__(self, name: typing_extensions.Literal["message"]) -> Schema_.Properties.Message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,18 +71,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["code"]) -> typing.Union[MetaOapg.Properties.Code, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["code"]) -> typing.Union[Schema_.Properties.Code, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.Properties.Type, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["type"]) -> typing.Union[Schema_.Properties.Type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.Properties.Message, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["message"]) -> typing.Union[Schema_.Properties.Message, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["code"],
@@ -91,23 +91,23 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        code: typing.Union[MetaOapg.Properties.Code, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        type: typing.Union[MetaOapg.Properties.Type, str, schemas.Unset] = schemas.unset,
-        message: typing.Union[MetaOapg.Properties.Message, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        code: typing.Union[Schema_.Properties.Code, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        type: typing.Union[Schema_.Properties.Type, str, schemas.Unset] = schemas.unset,
+        message: typing.Union[Schema_.Properties.Message, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             code=code,
             type=type,
             message=message,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.pyi
index ae919e8d9db..8dc88256018 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/api_response.pyi
@@ -33,7 +33,7 @@ class ApiResponse(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Code = schemas.Int32Schema
@@ -46,13 +46,13 @@ class ApiResponse(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["code"]) -> MetaOapg.Properties.Code: ...
+    def __getitem__(self, name: typing_extensions.Literal["code"]) -> Schema_.Properties.Code: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.Properties.Type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> Schema_.Properties.Type: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["message"]) -> MetaOapg.Properties.Message: ...
+    def __getitem__(self, name: typing_extensions.Literal["message"]) -> Schema_.Properties.Message: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -70,18 +70,18 @@ class ApiResponse(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["code"]) -> typing.Union[MetaOapg.Properties.Code, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["code"]) -> typing.Union[Schema_.Properties.Code, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.Properties.Type, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["type"]) -> typing.Union[Schema_.Properties.Type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["message"]) -> typing.Union[MetaOapg.Properties.Message, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["message"]) -> typing.Union[Schema_.Properties.Message, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["code"],
@@ -90,23 +90,23 @@ class ApiResponse(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        code: typing.Union[MetaOapg.Properties.Code, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        type: typing.Union[MetaOapg.Properties.Type, str, schemas.Unset] = schemas.unset,
-        message: typing.Union[MetaOapg.Properties.Message, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        code: typing.Union[Schema_.Properties.Code, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        type: typing.Union[Schema_.Properties.Type, str, schemas.Unset] = schemas.unset,
+        message: typing.Union[Schema_.Properties.Message, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApiResponse':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             code=code,
             type=type,
             message=message,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.py
index dd3888bc6c0..aecc26e1f29 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.py
@@ -36,7 +36,7 @@ class Apple(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             frozendict.frozendict,
@@ -53,7 +53,7 @@ class Cultivar(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -67,7 +67,7 @@ class Origin(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -83,13 +83,13 @@ class MetaOapg:
             }
 
     
-    cultivar: MetaOapg.Properties.Cultivar
+    cultivar: Schema_.Properties.Cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> MetaOapg.Properties.Origin: ...
+    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> Schema_.Properties.Origin: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -106,15 +106,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def get_item_(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["origin"]) -> typing.Union[MetaOapg.Properties.Origin, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["origin"]) -> typing.Union[Schema_.Properties.Origin, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["cultivar"],
@@ -122,19 +122,19 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, None, ],
-        origin: typing.Union[MetaOapg.Properties.Origin, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, None, ],
+        origin: typing.Union[Schema_.Properties.Origin, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Apple':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             origin=origin,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.pyi
index 2700d4f8474..bb890bdf589 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple.pyi
@@ -36,7 +36,7 @@ class Apple(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             frozendict.frozendict,
@@ -64,13 +64,13 @@ class Apple(
             }
 
     
-    cultivar: MetaOapg.Properties.Cultivar
+    cultivar: Schema_.Properties.Cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> MetaOapg.Properties.Origin: ...
+    def __getitem__(self, name: typing_extensions.Literal["origin"]) -> Schema_.Properties.Origin: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -87,15 +87,15 @@ class Apple(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def get_item_(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["origin"]) -> typing.Union[MetaOapg.Properties.Origin, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["origin"]) -> typing.Union[Schema_.Properties.Origin, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["cultivar"],
@@ -103,19 +103,19 @@ class Apple(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, None, ],
-        origin: typing.Union[MetaOapg.Properties.Origin, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, None, ],
+        origin: typing.Union[Schema_.Properties.Origin, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Apple':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             origin=origin,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.py
index ddfebc53b70..9b37997318e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.py
@@ -33,7 +33,7 @@ class AppleReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "cultivar",
@@ -48,13 +48,13 @@ class Properties:
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    cultivar: MetaOapg.Properties.Cultivar
+    cultivar: Schema_.Properties.Cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> MetaOapg.Properties.Mealy: ...
+    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> Schema_.Properties.Mealy: ...
     
     def __getitem__(
         self,
@@ -67,31 +67,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def get_item_(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[MetaOapg.Properties.Mealy, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[Schema_.Properties.Mealy, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["cultivar"],
             typing_extensions.Literal["mealy"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        cultivar: typing.Union[MetaOapg.Properties.Cultivar, str, ],
-        mealy: typing.Union[MetaOapg.Properties.Mealy, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        cultivar: typing.Union[Schema_.Properties.Cultivar, str, ],
+        mealy: typing.Union[Schema_.Properties.Mealy, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AppleReq':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             cultivar=cultivar,
             mealy=mealy,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.pyi
index 9edd17dab96..0c0ef39445b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/apple_req.pyi
@@ -33,7 +33,7 @@ class AppleReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "cultivar",
         }
@@ -47,13 +47,13 @@ class AppleReq(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    cultivar: MetaOapg.Properties.Cultivar
+    cultivar: Schema_.Properties.Cultivar
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def __getitem__(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> MetaOapg.Properties.Mealy: ...
+    def __getitem__(self, name: typing_extensions.Literal["mealy"]) -> Schema_.Properties.Mealy: ...
     
     def __getitem__(
         self,
@@ -66,31 +66,31 @@ class AppleReq(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cultivar"]) -> MetaOapg.Properties.Cultivar: ...
+    def get_item_(self, name: typing_extensions.Literal["cultivar"]) -> Schema_.Properties.Cultivar: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[MetaOapg.Properties.Mealy, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["mealy"]) -> typing.Union[Schema_.Properties.Mealy, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["cultivar"],
             typing_extensions.Literal["mealy"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        cultivar: typing.Union[MetaOapg.Properties.Cultivar, str, ],
-        mealy: typing.Union[MetaOapg.Properties.Mealy, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        cultivar: typing.Union[Schema_.Properties.Cultivar, str, ],
+        mealy: typing.Union[Schema_.Properties.Mealy, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'AppleReq':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             cultivar=cultivar,
             mealy=mealy,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.py
index e1307304692..2d69afb3eff 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.py
@@ -33,20 +33,20 @@ class ArrayHoldingAnyType(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayHoldingAnyType':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.pyi
index e1307304692..2d69afb3eff 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_holding_any_type.pyi
@@ -33,20 +33,20 @@ class ArrayHoldingAnyType(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayHoldingAnyType':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.py
index b0a88a89cff..139a6a3ef6c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.py
@@ -33,7 +33,7 @@ class ArrayOfArrayOfNumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,7 +44,7 @@ class ArrayArrayNumber(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -53,43 +53,43 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             Items = schemas.NumberSchema
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
-                        def __getitem__(self, i: int) -> MetaOapg.Items:
+                        def __getitem__(self, i: int) -> Schema_.Items:
                             return super().__getitem__(i)
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayNumber':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> MetaOapg.Properties.ArrayArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> Schema_.Properties.ArrayArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -105,31 +105,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.Properties.ArrayArrayNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[Schema_.Properties.ArrayArrayNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["ArrayArrayNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        ArrayArrayNumber: typing.Union[MetaOapg.Properties.ArrayArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        ArrayArrayNumber: typing.Union[Schema_.Properties.ArrayArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             ArrayArrayNumber=ArrayArrayNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.pyi
index b30f35145a9..7780eade4da 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_array_of_number_only.pyi
@@ -33,7 +33,7 @@ class ArrayOfArrayOfNumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,7 +43,7 @@ class ArrayOfArrayOfNumberOnly(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -52,43 +52,43 @@ class ArrayOfArrayOfNumberOnly(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             Items = schemas.NumberSchema
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
-                        def __getitem__(self, i: int) -> MetaOapg.Items:
+                        def __getitem__(self, i: int) -> Schema_.Items:
                             return super().__getitem__(i)
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayNumber':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "ArrayArrayNumber": ArrayArrayNumber,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> MetaOapg.Properties.ArrayArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> Schema_.Properties.ArrayArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -104,31 +104,31 @@ class ArrayOfArrayOfNumberOnly(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[MetaOapg.Properties.ArrayArrayNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ArrayArrayNumber"]) -> typing.Union[Schema_.Properties.ArrayArrayNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["ArrayArrayNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        ArrayArrayNumber: typing.Union[MetaOapg.Properties.ArrayArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        ArrayArrayNumber: typing.Union[Schema_.Properties.ArrayArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayOfArrayOfNumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             ArrayArrayNumber=ArrayArrayNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.py
index 516af70228b..c1a7a764cd8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.py
@@ -33,7 +33,7 @@ class ArrayOfEnums(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ def items() -> typing.Type['string_enum.StringEnum']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['string_enum.StringEnum'], typing.List['string_enum.StringEnum']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['string_enum.StringEnum'], typing.List['string_enum.StringEnum']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayOfEnums':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'string_enum.StringEnum':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.pyi
index 516af70228b..c1a7a764cd8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_enums.pyi
@@ -33,7 +33,7 @@ class ArrayOfEnums(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ class ArrayOfEnums(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['string_enum.StringEnum'], typing.List['string_enum.StringEnum']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['string_enum.StringEnum'], typing.List['string_enum.StringEnum']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayOfEnums':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'string_enum.StringEnum':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.py
index 2e282591909..ef7bc3b32b7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.py
@@ -33,7 +33,7 @@ class ArrayOfNumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,29 +44,29 @@ class ArrayNumber(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.NumberSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayNumber':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> MetaOapg.Properties.ArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> Schema_.Properties.ArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -82,31 +82,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.Properties.ArrayNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[Schema_.Properties.ArrayNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["ArrayNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        ArrayNumber: typing.Union[MetaOapg.Properties.ArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        ArrayNumber: typing.Union[Schema_.Properties.ArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             ArrayNumber=ArrayNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.pyi
index a4458d6e044..f21bc429dcc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_of_number_only.pyi
@@ -33,7 +33,7 @@ class ArrayOfNumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,29 +43,29 @@ class ArrayOfNumberOnly(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.NumberSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayNumber':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "ArrayNumber": ArrayNumber,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> MetaOapg.Properties.ArrayNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["ArrayNumber"]) -> Schema_.Properties.ArrayNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,31 +81,31 @@ class ArrayOfNumberOnly(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[MetaOapg.Properties.ArrayNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ArrayNumber"]) -> typing.Union[Schema_.Properties.ArrayNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["ArrayNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        ArrayNumber: typing.Union[MetaOapg.Properties.ArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        ArrayNumber: typing.Union[Schema_.Properties.ArrayNumber, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayOfNumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             ArrayNumber=ArrayNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.py
index 0344dbaeacc..229acd6e099 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.py
@@ -33,7 +33,7 @@ class ArrayTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,22 +44,22 @@ class ArrayOfString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.StrSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayOfString':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -68,7 +68,7 @@ class ArrayArrayOfInteger(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -77,36 +77,36 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             Items = schemas.Int64Schema
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]]],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, ]]],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
-                        def __getitem__(self, i: int) -> MetaOapg.Items:
+                        def __getitem__(self, i: int) -> Schema_.Items:
                             return super().__getitem__(i)
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayOfInteger':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -115,7 +115,7 @@ class ArrayArrayOfModel(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -124,7 +124,7 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             
                             @staticmethod
@@ -133,13 +133,13 @@ def items() -> typing.Type['read_only_first.ReadOnlyFirst']:
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple['read_only_first.ReadOnlyFirst'], typing.List['read_only_first.ReadOnlyFirst']],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple['read_only_first.ReadOnlyFirst'], typing.List['read_only_first.ReadOnlyFirst']],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
                         def __getitem__(self, i: int) -> 'read_only_first.ReadOnlyFirst':
@@ -147,16 +147,16 @@ def __getitem__(self, i: int) -> 'read_only_first.ReadOnlyFirst':
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayOfModel':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "array_of_string": ArrayOfString,
@@ -165,13 +165,13 @@ def __getitem__(self, i: int) -> MetaOapg.Items:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> MetaOapg.Properties.ArrayOfString: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> Schema_.Properties.ArrayOfString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> MetaOapg.Properties.ArrayArrayOfInteger: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> Schema_.Properties.ArrayArrayOfInteger: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> MetaOapg.Properties.ArrayArrayOfModel: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> Schema_.Properties.ArrayArrayOfModel: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -189,18 +189,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[MetaOapg.Properties.ArrayOfString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[Schema_.Properties.ArrayOfString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.Properties.ArrayArrayOfInteger, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[Schema_.Properties.ArrayArrayOfInteger, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.Properties.ArrayArrayOfModel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[Schema_.Properties.ArrayArrayOfModel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["array_of_string"],
@@ -209,24 +209,24 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        array_of_string: typing.Union[MetaOapg.Properties.ArrayOfString, list, tuple, schemas.Unset] = schemas.unset,
-        array_array_of_integer: typing.Union[MetaOapg.Properties.ArrayArrayOfInteger, list, tuple, schemas.Unset] = schemas.unset,
-        array_array_of_model: typing.Union[MetaOapg.Properties.ArrayArrayOfModel, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        array_of_string: typing.Union[Schema_.Properties.ArrayOfString, list, tuple, schemas.Unset] = schemas.unset,
+        array_array_of_integer: typing.Union[Schema_.Properties.ArrayArrayOfInteger, list, tuple, schemas.Unset] = schemas.unset,
+        array_array_of_model: typing.Union[Schema_.Properties.ArrayArrayOfModel, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             array_of_string=array_of_string,
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.pyi
index 6367d989634..ce199c9ec02 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_test.pyi
@@ -33,7 +33,7 @@ class ArrayTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,22 +43,22 @@ class ArrayTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.StrSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayOfString':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -67,7 +67,7 @@ class ArrayTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -76,36 +76,36 @@ class ArrayTest(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             Items = schemas.Int64Schema
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]]],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, ]]],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
-                        def __getitem__(self, i: int) -> MetaOapg.Items:
+                        def __getitem__(self, i: int) -> Schema_.Items:
                             return super().__getitem__(i)
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayOfInteger':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -114,7 +114,7 @@ class ArrayTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -123,7 +123,7 @@ class ArrayTest(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {tuple}
                             
                             @staticmethod
@@ -132,13 +132,13 @@ class ArrayTest(
                     
                         def __new__(
                             cls,
-                            _arg: typing.Union[typing.Tuple['read_only_first.ReadOnlyFirst'], typing.List['read_only_first.ReadOnlyFirst']],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            arg_: typing.Union[typing.Tuple['read_only_first.ReadOnlyFirst'], typing.List['read_only_first.ReadOnlyFirst']],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                _arg,
-                                _configuration=_configuration,
+                                arg_,
+                                configuration_=configuration_,
                             )
                     
                         def __getitem__(self, i: int) -> 'read_only_first.ReadOnlyFirst':
@@ -146,16 +146,16 @@ class ArrayTest(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, list, tuple, ]], typing.List[typing.Union[MetaOapg.Items, list, tuple, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, list, tuple, ]], typing.List[typing.Union[Schema_.Items, list, tuple, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayArrayOfModel':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "array_of_string": ArrayOfString,
@@ -164,13 +164,13 @@ class ArrayTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> MetaOapg.Properties.ArrayOfString: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_of_string"]) -> Schema_.Properties.ArrayOfString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> MetaOapg.Properties.ArrayArrayOfInteger: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_integer"]) -> Schema_.Properties.ArrayArrayOfInteger: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> MetaOapg.Properties.ArrayArrayOfModel: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_array_of_model"]) -> Schema_.Properties.ArrayArrayOfModel: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -188,18 +188,18 @@ class ArrayTest(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[MetaOapg.Properties.ArrayOfString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_of_string"]) -> typing.Union[Schema_.Properties.ArrayOfString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[MetaOapg.Properties.ArrayArrayOfInteger, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_array_of_integer"]) -> typing.Union[Schema_.Properties.ArrayArrayOfInteger, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[MetaOapg.Properties.ArrayArrayOfModel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_array_of_model"]) -> typing.Union[Schema_.Properties.ArrayArrayOfModel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["array_of_string"],
@@ -208,24 +208,24 @@ class ArrayTest(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        array_of_string: typing.Union[MetaOapg.Properties.ArrayOfString, list, tuple, schemas.Unset] = schemas.unset,
-        array_array_of_integer: typing.Union[MetaOapg.Properties.ArrayArrayOfInteger, list, tuple, schemas.Unset] = schemas.unset,
-        array_array_of_model: typing.Union[MetaOapg.Properties.ArrayArrayOfModel, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        array_of_string: typing.Union[Schema_.Properties.ArrayOfString, list, tuple, schemas.Unset] = schemas.unset,
+        array_array_of_integer: typing.Union[Schema_.Properties.ArrayArrayOfInteger, list, tuple, schemas.Unset] = schemas.unset,
+        array_array_of_model: typing.Union[Schema_.Properties.ArrayArrayOfModel, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ArrayTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             array_of_string=array_of_string,
             array_array_of_integer=array_array_of_integer,
             array_array_of_model=array_array_of_model,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.py
index 215d30bbaef..7c73ee016e0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.py
@@ -33,7 +33,7 @@ class ArrayWithValidationsInItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         max_items = 2
         
@@ -43,7 +43,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     decimal.Decimal,
                 }
@@ -52,14 +52,14 @@ class MetaOapg:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayWithValidationsInItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.pyi
index 67f330186df..5e13857cb1c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/array_with_validations_in_items.pyi
@@ -33,7 +33,7 @@ class ArrayWithValidationsInItems(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         max_items = 2
         
@@ -45,14 +45,14 @@ class ArrayWithValidationsInItems(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ArrayWithValidationsInItems':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.py
index a1bbeb81e05..fdc6d432413 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.py
@@ -33,7 +33,7 @@ class Banana(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "lengthCm",
@@ -45,10 +45,10 @@ class Properties:
                 "lengthCm": LengthCm,
             }
     
-    lengthCm: MetaOapg.Properties.LengthCm
+    lengthCm: Schema_.Properties.LengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,31 +64,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def get_item_(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["lengthCm"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        lengthCm: typing.Union[MetaOapg.Properties.LengthCm, decimal.Decimal, int, float, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        lengthCm: typing.Union[Schema_.Properties.LengthCm, decimal.Decimal, int, float, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Banana':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             lengthCm=lengthCm,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.pyi
index 7796c3081c2..df8b32a7d1b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana.pyi
@@ -33,7 +33,7 @@ class Banana(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "lengthCm",
         }
@@ -44,10 +44,10 @@ class Banana(
                 "lengthCm": LengthCm,
             }
     
-    lengthCm: MetaOapg.Properties.LengthCm
+    lengthCm: Schema_.Properties.LengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -63,31 +63,31 @@ class Banana(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def get_item_(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["lengthCm"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        lengthCm: typing.Union[MetaOapg.Properties.LengthCm, decimal.Decimal, int, float, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        lengthCm: typing.Union[Schema_.Properties.LengthCm, decimal.Decimal, int, float, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Banana':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             lengthCm=lengthCm,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.py
index 0587b82efbe..ee10df5a107 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.py
@@ -33,7 +33,7 @@ class BananaReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "lengthCm",
@@ -48,13 +48,13 @@ class Properties:
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    lengthCm: MetaOapg.Properties.LengthCm
+    lengthCm: Schema_.Properties.LengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> MetaOapg.Properties.Sweet: ...
+    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> Schema_.Properties.Sweet: ...
     
     def __getitem__(
         self,
@@ -67,31 +67,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def get_item_(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[MetaOapg.Properties.Sweet, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[Schema_.Properties.Sweet, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["lengthCm"],
             typing_extensions.Literal["sweet"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        lengthCm: typing.Union[MetaOapg.Properties.LengthCm, decimal.Decimal, int, float, ],
-        sweet: typing.Union[MetaOapg.Properties.Sweet, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        lengthCm: typing.Union[Schema_.Properties.LengthCm, decimal.Decimal, int, float, ],
+        sweet: typing.Union[Schema_.Properties.Sweet, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'BananaReq':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             lengthCm=lengthCm,
             sweet=sweet,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.pyi
index 349dcb4fe41..588281f4772 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/banana_req.pyi
@@ -33,7 +33,7 @@ class BananaReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "lengthCm",
         }
@@ -47,13 +47,13 @@ class BananaReq(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    lengthCm: MetaOapg.Properties.LengthCm
+    lengthCm: Schema_.Properties.LengthCm
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def __getitem__(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> MetaOapg.Properties.Sweet: ...
+    def __getitem__(self, name: typing_extensions.Literal["sweet"]) -> Schema_.Properties.Sweet: ...
     
     def __getitem__(
         self,
@@ -66,31 +66,31 @@ class BananaReq(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lengthCm"]) -> MetaOapg.Properties.LengthCm: ...
+    def get_item_(self, name: typing_extensions.Literal["lengthCm"]) -> Schema_.Properties.LengthCm: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[MetaOapg.Properties.Sweet, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["sweet"]) -> typing.Union[Schema_.Properties.Sweet, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["lengthCm"],
             typing_extensions.Literal["sweet"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        lengthCm: typing.Union[MetaOapg.Properties.LengthCm, decimal.Decimal, int, float, ],
-        sweet: typing.Union[MetaOapg.Properties.Sweet, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        lengthCm: typing.Union[Schema_.Properties.LengthCm, decimal.Decimal, int, float, ],
+        sweet: typing.Union[Schema_.Properties.Sweet, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'BananaReq':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             lengthCm=lengthCm,
             sweet=sweet,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.py
index 5c8ceca403d..b70718bad8c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.py
@@ -33,7 +33,7 @@ class BasquePig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "className",
@@ -47,7 +47,7 @@ class ClassName(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -62,10 +62,10 @@ def BASQUE_PIG(cls):
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,31 +81,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.pyi
index 59e0bda26d7..ba06d009cc6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/basque_pig.pyi
@@ -33,7 +33,7 @@ class BasquePig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "className",
         }
@@ -52,10 +52,10 @@ class BasquePig(
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,31 +71,31 @@ class BasquePig(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'BasquePig':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/boolean_enum.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/boolean_enum.py
index 1ba57ab9c2b..9baac884b4f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/boolean_enum.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/boolean_enum.py
@@ -33,7 +33,7 @@ class BooleanEnum(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.BoolClass,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.py
index db19ea8e5c1..f28ef9c191b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.py
@@ -33,7 +33,7 @@ class Capitalization(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -53,22 +53,22 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> MetaOapg.Properties.SmallCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> Schema_.Properties.SmallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> MetaOapg.Properties.CapitalCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> Schema_.Properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> MetaOapg.Properties.SmallSnake: ...
+    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> Schema_.Properties.SmallSnake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> MetaOapg.Properties.CapitalSnake: ...
+    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> Schema_.Properties.CapitalSnake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.Properties.SCAETHFlowPoints: ...
+    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> Schema_.Properties.SCAETHFlowPoints: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> MetaOapg.Properties.ATTNAME: ...
+    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> Schema_.Properties.ATTNAME: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -89,27 +89,27 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[MetaOapg.Properties.SmallCamel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[Schema_.Properties.SmallCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.Properties.CapitalCamel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[Schema_.Properties.CapitalCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[MetaOapg.Properties.SmallSnake, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[Schema_.Properties.SmallSnake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.Properties.CapitalSnake, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[Schema_.Properties.CapitalSnake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.Properties.SCAETHFlowPoints, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[Schema_.Properties.SCAETHFlowPoints, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.Properties.ATTNAME, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[Schema_.Properties.ATTNAME, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["smallCamel"],
@@ -121,29 +121,29 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        smallCamel: typing.Union[MetaOapg.Properties.SmallCamel, str, schemas.Unset] = schemas.unset,
-        CapitalCamel: typing.Union[MetaOapg.Properties.CapitalCamel, str, schemas.Unset] = schemas.unset,
-        small_Snake: typing.Union[MetaOapg.Properties.SmallSnake, str, schemas.Unset] = schemas.unset,
-        Capital_Snake: typing.Union[MetaOapg.Properties.CapitalSnake, str, schemas.Unset] = schemas.unset,
-        SCA_ETH_Flow_Points: typing.Union[MetaOapg.Properties.SCAETHFlowPoints, str, schemas.Unset] = schemas.unset,
-        ATT_NAME: typing.Union[MetaOapg.Properties.ATTNAME, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        smallCamel: typing.Union[Schema_.Properties.SmallCamel, str, schemas.Unset] = schemas.unset,
+        CapitalCamel: typing.Union[Schema_.Properties.CapitalCamel, str, schemas.Unset] = schemas.unset,
+        small_Snake: typing.Union[Schema_.Properties.SmallSnake, str, schemas.Unset] = schemas.unset,
+        Capital_Snake: typing.Union[Schema_.Properties.CapitalSnake, str, schemas.Unset] = schemas.unset,
+        SCA_ETH_Flow_Points: typing.Union[Schema_.Properties.SCAETHFlowPoints, str, schemas.Unset] = schemas.unset,
+        ATT_NAME: typing.Union[Schema_.Properties.ATTNAME, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             smallCamel=smallCamel,
             CapitalCamel=CapitalCamel,
             small_Snake=small_Snake,
             Capital_Snake=Capital_Snake,
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.pyi
index bba8535d6af..6663a873a70 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/capitalization.pyi
@@ -33,7 +33,7 @@ class Capitalization(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             SmallCamel = schemas.StrSchema
@@ -52,22 +52,22 @@ class Capitalization(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> MetaOapg.Properties.SmallCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["smallCamel"]) -> Schema_.Properties.SmallCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> MetaOapg.Properties.CapitalCamel: ...
+    def __getitem__(self, name: typing_extensions.Literal["CapitalCamel"]) -> Schema_.Properties.CapitalCamel: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> MetaOapg.Properties.SmallSnake: ...
+    def __getitem__(self, name: typing_extensions.Literal["small_Snake"]) -> Schema_.Properties.SmallSnake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> MetaOapg.Properties.CapitalSnake: ...
+    def __getitem__(self, name: typing_extensions.Literal["Capital_Snake"]) -> Schema_.Properties.CapitalSnake: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> MetaOapg.Properties.SCAETHFlowPoints: ...
+    def __getitem__(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> Schema_.Properties.SCAETHFlowPoints: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> MetaOapg.Properties.ATTNAME: ...
+    def __getitem__(self, name: typing_extensions.Literal["ATT_NAME"]) -> Schema_.Properties.ATTNAME: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -88,27 +88,27 @@ class Capitalization(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[MetaOapg.Properties.SmallCamel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["smallCamel"]) -> typing.Union[Schema_.Properties.SmallCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[MetaOapg.Properties.CapitalCamel, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["CapitalCamel"]) -> typing.Union[Schema_.Properties.CapitalCamel, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[MetaOapg.Properties.SmallSnake, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["small_Snake"]) -> typing.Union[Schema_.Properties.SmallSnake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[MetaOapg.Properties.CapitalSnake, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["Capital_Snake"]) -> typing.Union[Schema_.Properties.CapitalSnake, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[MetaOapg.Properties.SCAETHFlowPoints, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["SCA_ETH_Flow_Points"]) -> typing.Union[Schema_.Properties.SCAETHFlowPoints, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[MetaOapg.Properties.ATTNAME, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["ATT_NAME"]) -> typing.Union[Schema_.Properties.ATTNAME, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["smallCamel"],
@@ -120,29 +120,29 @@ class Capitalization(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        smallCamel: typing.Union[MetaOapg.Properties.SmallCamel, str, schemas.Unset] = schemas.unset,
-        CapitalCamel: typing.Union[MetaOapg.Properties.CapitalCamel, str, schemas.Unset] = schemas.unset,
-        small_Snake: typing.Union[MetaOapg.Properties.SmallSnake, str, schemas.Unset] = schemas.unset,
-        Capital_Snake: typing.Union[MetaOapg.Properties.CapitalSnake, str, schemas.Unset] = schemas.unset,
-        SCA_ETH_Flow_Points: typing.Union[MetaOapg.Properties.SCAETHFlowPoints, str, schemas.Unset] = schemas.unset,
-        ATT_NAME: typing.Union[MetaOapg.Properties.ATTNAME, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        smallCamel: typing.Union[Schema_.Properties.SmallCamel, str, schemas.Unset] = schemas.unset,
+        CapitalCamel: typing.Union[Schema_.Properties.CapitalCamel, str, schemas.Unset] = schemas.unset,
+        small_Snake: typing.Union[Schema_.Properties.SmallSnake, str, schemas.Unset] = schemas.unset,
+        Capital_Snake: typing.Union[Schema_.Properties.CapitalSnake, str, schemas.Unset] = schemas.unset,
+        SCA_ETH_Flow_Points: typing.Union[Schema_.Properties.SCAETHFlowPoints, str, schemas.Unset] = schemas.unset,
+        ATT_NAME: typing.Union[Schema_.Properties.ATTNAME, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Capitalization':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             smallCamel=smallCamel,
             CapitalCamel=CapitalCamel,
             small_Snake=small_Snake,
             Capital_Snake=Capital_Snake,
             SCA_ETH_Flow_Points=SCA_ETH_Flow_Points,
             ATT_NAME=ATT_NAME,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.py
index fbcb866dece..ecee1f2e325 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.py
@@ -33,7 +33,7 @@ class Cat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -58,7 +58,7 @@ class Properties:
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> MetaOapg.Properties.Declawed: ...
+                def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> Schema_.Properties.Declawed: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[MetaOapg.Properties.Declawed, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[Schema_.Properties.Declawed, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["declawed"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    declawed: typing.Union[MetaOapg.Properties.Declawed, bool, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    declawed: typing.Union[Schema_.Properties.Declawed, bool, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         declawed=declawed,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -110,14 +110,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Cat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.pyi
index 3677461d1fe..0cb6735749c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/cat.pyi
@@ -33,7 +33,7 @@ class Cat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class Cat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         Declawed = schemas.BoolSchema
@@ -57,7 +57,7 @@ class Cat(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> MetaOapg.Properties.Declawed: ...
+                def __getitem__(self, name: typing_extensions.Literal["declawed"]) -> Schema_.Properties.Declawed: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -73,32 +73,32 @@ class Cat(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[MetaOapg.Properties.Declawed, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["declawed"]) -> typing.Union[Schema_.Properties.Declawed, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["declawed"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    declawed: typing.Union[MetaOapg.Properties.Declawed, bool, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    declawed: typing.Union[Schema_.Properties.Declawed, bool, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         declawed=declawed,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -109,14 +109,14 @@ class Cat(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Cat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.py
index b44bc015a6c..9014b1a9ad4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.py
@@ -33,7 +33,7 @@ class Category(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "name",
@@ -47,13 +47,13 @@ class Properties:
                 "name": Name,
             }
     
-    name: MetaOapg.Properties.Name
+    name: Schema_.Properties.Name
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -70,15 +70,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -86,21 +86,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Category':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             id=id,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.pyi
index 7984b8ff1eb..69654d25b11 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/category.pyi
@@ -33,7 +33,7 @@ class Category(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "name",
         }
@@ -46,13 +46,13 @@ class Category(
                 "name": Name,
             }
     
-    name: MetaOapg.Properties.Name
+    name: Schema_.Properties.Name
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -69,15 +69,15 @@ class Category(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -85,21 +85,21 @@ class Category(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Category':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             id=id,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.py
index 69f162553a0..627f01b2495 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.py
@@ -33,7 +33,7 @@ class ChildCat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -58,7 +58,7 @@ class Properties:
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+                def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["name"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         name=name,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -110,14 +110,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.pyi
index df1f495bcb8..bac5c8177f9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/child_cat.pyi
@@ -33,7 +33,7 @@ class ChildCat(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class ChildCat(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         Name = schemas.StrSchema
@@ -57,7 +57,7 @@ class ChildCat(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+                def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -73,32 +73,32 @@ class ChildCat(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["name"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         name=name,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -109,14 +109,14 @@ class ChildCat(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ChildCat':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.py
index 24a6c99896c..eaaaada5fc3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.py
@@ -35,7 +35,7 @@ class ClassModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,7 +46,7 @@ class Properties:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> MetaOapg.Properties._Class: ...
+    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> Schema_.Properties._Class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -62,31 +62,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["_class"]) -> typing.Union[MetaOapg.Properties._Class, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["_class"]) -> typing.Union[Schema_.Properties._Class, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["_class"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _class: typing.Union[MetaOapg.Properties._Class, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        _class: typing.Union[Schema_.Properties._Class, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             _class=_class,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.pyi
index 24a6c99896c..eaaaada5fc3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/class_model.pyi
@@ -35,7 +35,7 @@ class ClassModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -46,7 +46,7 @@ class ClassModel(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> MetaOapg.Properties._Class: ...
+    def __getitem__(self, name: typing_extensions.Literal["_class"]) -> Schema_.Properties._Class: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -62,31 +62,31 @@ class ClassModel(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["_class"]) -> typing.Union[MetaOapg.Properties._Class, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["_class"]) -> typing.Union[Schema_.Properties._Class, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["_class"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _class: typing.Union[MetaOapg.Properties._Class, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        _class: typing.Union[Schema_.Properties._Class, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ClassModel':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             _class=_class,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.py
index a9c399d1a98..ccbfcdcbbdb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.py
@@ -33,7 +33,7 @@ class Client(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -43,7 +43,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["client"]) -> MetaOapg.Properties.Client: ...
+    def __getitem__(self, name: typing_extensions.Literal["client"]) -> Schema_.Properties.Client: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -59,31 +59,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["client"]) -> typing.Union[MetaOapg.Properties.Client, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["client"]) -> typing.Union[Schema_.Properties.Client, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["client"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        client: typing.Union[MetaOapg.Properties.Client, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        client: typing.Union[Schema_.Properties.Client, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Client':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             client=client,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.pyi
index 5c8bc0559c2..dd83538289a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/client.pyi
@@ -33,7 +33,7 @@ class Client(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Client = schemas.StrSchema
@@ -42,7 +42,7 @@ class Client(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["client"]) -> MetaOapg.Properties.Client: ...
+    def __getitem__(self, name: typing_extensions.Literal["client"]) -> Schema_.Properties.Client: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -58,31 +58,31 @@ class Client(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["client"]) -> typing.Union[MetaOapg.Properties.Client, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["client"]) -> typing.Union[Schema_.Properties.Client, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["client"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        client: typing.Union[MetaOapg.Properties.Client, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        client: typing.Union[Schema_.Properties.Client, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Client':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             client=client,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.py
index 07ed026ee99..107d015a7aa 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.py
@@ -33,7 +33,7 @@ class ComplexQuadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -59,7 +59,7 @@ class QuadrilateralType(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -75,7 +75,7 @@ def COMPLEX_QUADRILATERAL(cls):
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,32 +91,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.Properties.QuadrilateralType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[Schema_.Properties.QuadrilateralType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["quadrilateralType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         quadrilateralType=quadrilateralType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -127,14 +127,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.pyi
index 79be1b79c7b..2fbb16b7159 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/complex_quadrilateral.pyi
@@ -33,7 +33,7 @@ class ComplexQuadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class ComplexQuadrilateral(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         
@@ -65,7 +65,7 @@ class ComplexQuadrilateral(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,32 +81,32 @@ class ComplexQuadrilateral(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.Properties.QuadrilateralType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[Schema_.Properties.QuadrilateralType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["quadrilateralType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         quadrilateralType=quadrilateralType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -117,14 +117,14 @@ class ComplexQuadrilateral(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComplexQuadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.py
index 065872e46cd..e4a42922bdf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.py
@@ -33,7 +33,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -53,22 +53,22 @@ class AnyOf9(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.AnyTypeSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'AnyOf9':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             AnyOf10 = schemas.NumberSchema
             AnyOf11 = schemas.Float32Schema
@@ -98,13 +98,13 @@ def __getitem__(self, i: int) -> MetaOapg.Items:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.pyi
index 065872e46cd..e4a42922bdf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_any_of_different_types_no_validations.pyi
@@ -33,7 +33,7 @@ class ComposedAnyOfDifferentTypesNoValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AnyOf:
@@ -53,22 +53,22 @@ class ComposedAnyOfDifferentTypesNoValidations(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.AnyTypeSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'AnyOf9':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             AnyOf10 = schemas.NumberSchema
             AnyOf11 = schemas.Float32Schema
@@ -98,13 +98,13 @@ class ComposedAnyOfDifferentTypesNoValidations(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedAnyOfDifferentTypesNoValidations':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.py
index 5a5c901be67..66a475be607 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.py
@@ -33,20 +33,20 @@ class ComposedArray(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedArray':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.pyi
index 5a5c901be67..66a475be607 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_array.pyi
@@ -33,20 +33,20 @@ class ComposedArray(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.AnyTypeSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedArray':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.py
index 107fa816d49..c2745dd246c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.py
@@ -33,7 +33,7 @@ class ComposedBool(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.BoolClass,
         }
@@ -47,11 +47,11 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[bool, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[bool, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedBool':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.pyi
index 107fa816d49..c2745dd246c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_bool.pyi
@@ -33,7 +33,7 @@ class ComposedBool(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.BoolClass,
         }
@@ -47,11 +47,11 @@ class ComposedBool(
 
     def __new__(
         cls,
-        *_args: typing.Union[bool, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[bool, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedBool':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.py
index 1b529217df0..24be93aaeb0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.py
@@ -33,7 +33,7 @@ class ComposedNone(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
         }
@@ -47,11 +47,11 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[None, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedNone':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.pyi
index 1b529217df0..24be93aaeb0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_none.pyi
@@ -33,7 +33,7 @@ class ComposedNone(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
         }
@@ -47,11 +47,11 @@ class ComposedNone(
 
     def __new__(
         cls,
-        *_args: typing.Union[None, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedNone':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.py
index d571665659d..490159ba1ae 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.py
@@ -33,7 +33,7 @@ class ComposedNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
@@ -47,11 +47,11 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[decimal.Decimal, int, float, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[decimal.Decimal, int, float, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.pyi
index d571665659d..490159ba1ae 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_number.pyi
@@ -33,7 +33,7 @@ class ComposedNumber(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
@@ -47,11 +47,11 @@ class ComposedNumber(
 
     def __new__(
         cls,
-        *_args: typing.Union[decimal.Decimal, int, float, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[decimal.Decimal, int, float, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedNumber':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.py
index 0fef1d0a45b..4d38042b50b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.py
@@ -33,7 +33,7 @@ class ComposedObject(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -47,13 +47,13 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.pyi
index 0fef1d0a45b..4d38042b50b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_object.pyi
@@ -33,7 +33,7 @@ class ComposedObject(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -47,13 +47,13 @@ class ComposedObject(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedObject':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.py
index 8dcfd9d12c3..e9c990c20d0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.py
@@ -35,7 +35,7 @@ class ComposedOneOfDifferentTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -56,21 +56,21 @@ class OneOf4(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     max_properties = 4
                     min_properties = 4
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf4':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -80,7 +80,7 @@ class OneOf5(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     max_items = 4
                     min_items = 4
@@ -88,16 +88,16 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'OneOf5':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -106,7 +106,7 @@ class OneOf6(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -127,14 +127,14 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.pyi
index a471f465468..69d524cc669 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_one_of_different_types.pyi
@@ -35,7 +35,7 @@ class ComposedOneOfDifferentTypes(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -57,14 +57,14 @@ class ComposedOneOfDifferentTypes(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'OneOf4':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -74,7 +74,7 @@ class ComposedOneOfDifferentTypes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     max_items = 4
                     min_items = 4
@@ -82,16 +82,16 @@ class ComposedOneOfDifferentTypes(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'OneOf5':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -112,14 +112,14 @@ class ComposedOneOfDifferentTypes(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ComposedOneOfDifferentTypes':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.py
index 6dce303c18d..976b8433c31 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.py
@@ -33,7 +33,7 @@ class ComposedString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -47,11 +47,11 @@ class AllOf:
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.pyi
index 6dce303c18d..976b8433c31 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/composed_string.pyi
@@ -33,7 +33,7 @@ class ComposedString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
@@ -47,11 +47,11 @@ class ComposedString(
 
     def __new__(
         cls,
-        *_args: typing.Union[str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ComposedString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/currency.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/currency.py
index 0c27f94a4fe..aef2ac12b58 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/currency.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/currency.py
@@ -33,7 +33,7 @@ class Currency(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.py
index a874f1b4c2e..b7804c76fd5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.py
@@ -33,7 +33,7 @@ class DanishPig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "className",
@@ -47,7 +47,7 @@ class ClassName(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -62,10 +62,10 @@ def DANISH_PIG(cls):
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,31 +81,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.pyi
index 59d3c9768a8..7a0148eba0d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/danish_pig.pyi
@@ -33,7 +33,7 @@ class DanishPig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "className",
         }
@@ -52,10 +52,10 @@ class DanishPig(
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,31 +71,31 @@ class DanishPig(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'DanishPig':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_time_with_validations.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_time_with_validations.py
index b5512ae1451..dc8ad2a89ad 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_time_with_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_time_with_validations.py
@@ -33,7 +33,7 @@ class DateTimeWithValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_with_validations.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_with_validations.py
index 304f319bcab..a8da79d3bc3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_with_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/date_with_validations.py
@@ -33,7 +33,7 @@ class DateWithValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.py
index fa4ebd14499..fc0173d0804 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.py
@@ -33,7 +33,7 @@ class Dog(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -58,7 +58,7 @@ class Properties:
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["breed"]) -> MetaOapg.Properties.Breed: ...
+                def __getitem__(self, name: typing_extensions.Literal["breed"]) -> Schema_.Properties.Breed: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["breed"]) -> typing.Union[MetaOapg.Properties.Breed, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["breed"]) -> typing.Union[Schema_.Properties.Breed, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["breed"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    breed: typing.Union[MetaOapg.Properties.Breed, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    breed: typing.Union[Schema_.Properties.Breed, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         breed=breed,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -110,14 +110,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Dog':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.pyi
index f805d96c31c..f845c2d18ca 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/dog.pyi
@@ -33,7 +33,7 @@ class Dog(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class Dog(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         Breed = schemas.StrSchema
@@ -57,7 +57,7 @@ class Dog(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["breed"]) -> MetaOapg.Properties.Breed: ...
+                def __getitem__(self, name: typing_extensions.Literal["breed"]) -> Schema_.Properties.Breed: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -73,32 +73,32 @@ class Dog(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["breed"]) -> typing.Union[MetaOapg.Properties.Breed, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["breed"]) -> typing.Union[Schema_.Properties.Breed, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["breed"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    breed: typing.Union[MetaOapg.Properties.Breed, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    breed: typing.Union[Schema_.Properties.Breed, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         breed=breed,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -109,14 +109,14 @@ class Dog(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Dog':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.py
index caba8750ae2..4a3d8d02e7d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.py
@@ -33,7 +33,7 @@ class Drawing(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -56,7 +56,7 @@ class Shapes(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -65,13 +65,13 @@ def items() -> typing.Type['shape.Shape']:
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['shape.Shape'], typing.List['shape.Shape']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['shape.Shape'], typing.List['shape.Shape']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Shapes':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'shape.Shape':
@@ -97,7 +97,7 @@ def __getitem__(self, name: typing_extensions.Literal["shapeOrNull"]) -> 'shape_
     def __getitem__(self, name: typing_extensions.Literal["nullableShape"]) -> 'nullable_shape.NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> MetaOapg.Properties.Shapes: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> Schema_.Properties.Shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> 'fruit.Fruit': ...
@@ -116,21 +116,21 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['shape.Shape', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['shape.Shape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['shape_or_null.ShapeOrNull', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['shape_or_null.ShapeOrNull', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['nullable_shape.NullableShape', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['nullable_shape.NullableShape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[MetaOapg.Properties.Shapes, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[Schema_.Properties.Shapes, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union['fruit.Fruit', schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union['fruit.Fruit', schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["mainShape"],
@@ -140,26 +140,26 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         mainShape: typing.Union['shape.Shape', schemas.Unset] = schemas.unset,
         shapeOrNull: typing.Union['shape_or_null.ShapeOrNull', schemas.Unset] = schemas.unset,
         nullableShape: typing.Union['nullable_shape.NullableShape', schemas.Unset] = schemas.unset,
-        shapes: typing.Union[MetaOapg.Properties.Shapes, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        shapes: typing.Union[Schema_.Properties.Shapes, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'fruit.Fruit',
     ) -> 'Drawing':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             mainShape=mainShape,
             shapeOrNull=shapeOrNull,
             nullableShape=nullableShape,
             shapes=shapes,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.pyi
index cc7410121cd..22c12d14521 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/drawing.pyi
@@ -33,7 +33,7 @@ class Drawing(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -55,7 +55,7 @@ class Drawing(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -64,13 +64,13 @@ class Drawing(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['shape.Shape'], typing.List['shape.Shape']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['shape.Shape'], typing.List['shape.Shape']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Shapes':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'shape.Shape':
@@ -96,7 +96,7 @@ class Drawing(
     def __getitem__(self, name: typing_extensions.Literal["nullableShape"]) -> 'nullable_shape.NullableShape': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> MetaOapg.Properties.Shapes: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapes"]) -> Schema_.Properties.Shapes: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> 'fruit.Fruit': ...
@@ -115,21 +115,21 @@ class Drawing(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['shape.Shape', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["mainShape"]) -> typing.Union['shape.Shape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['shape_or_null.ShapeOrNull', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeOrNull"]) -> typing.Union['shape_or_null.ShapeOrNull', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['nullable_shape.NullableShape', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["nullableShape"]) -> typing.Union['nullable_shape.NullableShape', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[MetaOapg.Properties.Shapes, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shapes"]) -> typing.Union[Schema_.Properties.Shapes, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union['fruit.Fruit', schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union['fruit.Fruit', schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["mainShape"],
@@ -139,26 +139,26 @@ class Drawing(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         mainShape: typing.Union['shape.Shape', schemas.Unset] = schemas.unset,
         shapeOrNull: typing.Union['shape_or_null.ShapeOrNull', schemas.Unset] = schemas.unset,
         nullableShape: typing.Union['nullable_shape.NullableShape', schemas.Unset] = schemas.unset,
-        shapes: typing.Union[MetaOapg.Properties.Shapes, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        shapes: typing.Union[Schema_.Properties.Shapes, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'fruit.Fruit',
     ) -> 'Drawing':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             mainShape=mainShape,
             shapeOrNull=shapeOrNull,
             nullableShape=nullableShape,
             shapes=shapes,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.py
index 8ff29dc66ae..e5dd896de7d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.py
@@ -33,7 +33,7 @@ class EnumArrays(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,7 +44,7 @@ class JustSymbol(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -67,7 +67,7 @@ class ArrayEnum(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -76,7 +76,7 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 str,
                             }
@@ -95,16 +95,16 @@ def CRAB(cls):
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayEnum':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "just_symbol": JustSymbol,
@@ -112,10 +112,10 @@ def __getitem__(self, i: int) -> MetaOapg.Items:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> MetaOapg.Properties.JustSymbol: ...
+    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> Schema_.Properties.JustSymbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> MetaOapg.Properties.ArrayEnum: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> Schema_.Properties.ArrayEnum: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -132,15 +132,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[MetaOapg.Properties.JustSymbol, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[Schema_.Properties.JustSymbol, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[MetaOapg.Properties.ArrayEnum, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[Schema_.Properties.ArrayEnum, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["just_symbol"],
@@ -148,21 +148,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        just_symbol: typing.Union[MetaOapg.Properties.JustSymbol, str, schemas.Unset] = schemas.unset,
-        array_enum: typing.Union[MetaOapg.Properties.ArrayEnum, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        just_symbol: typing.Union[Schema_.Properties.JustSymbol, str, schemas.Unset] = schemas.unset,
+        array_enum: typing.Union[Schema_.Properties.ArrayEnum, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             just_symbol=just_symbol,
             array_enum=array_enum,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.pyi
index 6acfd1290e9..1230e7e504e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_arrays.pyi
@@ -33,7 +33,7 @@ class EnumArrays(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -56,7 +56,7 @@ class EnumArrays(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -74,16 +74,16 @@ class EnumArrays(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayEnum':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "just_symbol": JustSymbol,
@@ -91,10 +91,10 @@ class EnumArrays(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> MetaOapg.Properties.JustSymbol: ...
+    def __getitem__(self, name: typing_extensions.Literal["just_symbol"]) -> Schema_.Properties.JustSymbol: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> MetaOapg.Properties.ArrayEnum: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_enum"]) -> Schema_.Properties.ArrayEnum: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -111,15 +111,15 @@ class EnumArrays(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[MetaOapg.Properties.JustSymbol, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["just_symbol"]) -> typing.Union[Schema_.Properties.JustSymbol, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[MetaOapg.Properties.ArrayEnum, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_enum"]) -> typing.Union[Schema_.Properties.ArrayEnum, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["just_symbol"],
@@ -127,21 +127,21 @@ class EnumArrays(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        just_symbol: typing.Union[MetaOapg.Properties.JustSymbol, str, schemas.Unset] = schemas.unset,
-        array_enum: typing.Union[MetaOapg.Properties.ArrayEnum, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        just_symbol: typing.Union[Schema_.Properties.JustSymbol, str, schemas.Unset] = schemas.unset,
+        array_enum: typing.Union[Schema_.Properties.ArrayEnum, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumArrays':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             just_symbol=just_symbol,
             array_enum=array_enum,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_class.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_class.py
index 9dbc6e2bb7d..4c8e771f338 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_class.py
@@ -33,7 +33,7 @@ class EnumClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.py
index e10462240b9..5c337a7fc6c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.py
@@ -33,7 +33,7 @@ class EnumTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "enum_string_required",
@@ -47,7 +47,7 @@ class EnumString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -75,7 +75,7 @@ class EnumStringRequired(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -103,7 +103,7 @@ class EnumInteger(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -127,7 +127,7 @@ class EnumNumber(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -176,19 +176,19 @@ def integer_enum_one_value() -> typing.Type['integer_enum_one_value.IntegerEnumO
                 "IntegerEnumOneValue": integer_enum_one_value,
             }
     
-    enum_string_required: MetaOapg.Properties.EnumStringRequired
+    enum_string_required: Schema_.Properties.EnumStringRequired
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.Properties.EnumStringRequired: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> Schema_.Properties.EnumStringRequired: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> MetaOapg.Properties.EnumString: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> Schema_.Properties.EnumString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> MetaOapg.Properties.EnumInteger: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> Schema_.Properties.EnumInteger: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> MetaOapg.Properties.EnumNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> Schema_.Properties.EnumNumber: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["stringEnum"]) -> 'string_enum.StringEnum': ...
@@ -227,36 +227,36 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.Properties.EnumStringRequired: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_string_required"]) -> Schema_.Properties.EnumStringRequired: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[MetaOapg.Properties.EnumString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[Schema_.Properties.EnumString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[MetaOapg.Properties.EnumInteger, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[Schema_.Properties.EnumInteger, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[MetaOapg.Properties.EnumNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[Schema_.Properties.EnumNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['string_enum.StringEnum', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['string_enum.StringEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['integer_enum.IntegerEnum', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['integer_enum.IntegerEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["enum_string_required"],
@@ -271,26 +271,26 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        enum_string_required: typing.Union[MetaOapg.Properties.EnumStringRequired, str, ],
-        enum_string: typing.Union[MetaOapg.Properties.EnumString, str, schemas.Unset] = schemas.unset,
-        enum_integer: typing.Union[MetaOapg.Properties.EnumInteger, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        enum_number: typing.Union[MetaOapg.Properties.EnumNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        enum_string_required: typing.Union[Schema_.Properties.EnumStringRequired, str, ],
+        enum_string: typing.Union[Schema_.Properties.EnumString, str, schemas.Unset] = schemas.unset,
+        enum_integer: typing.Union[Schema_.Properties.EnumInteger, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        enum_number: typing.Union[Schema_.Properties.EnumNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         stringEnum: typing.Union['string_enum.StringEnum', schemas.Unset] = schemas.unset,
         IntegerEnum: typing.Union['integer_enum.IntegerEnum', schemas.Unset] = schemas.unset,
         StringEnumWithDefaultValue: typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumWithDefaultValue: typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             enum_string_required=enum_string_required,
             enum_string=enum_string,
             enum_integer=enum_integer,
@@ -300,7 +300,7 @@ def __new__(
             StringEnumWithDefaultValue=StringEnumWithDefaultValue,
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.pyi
index 093d597acdd..9a95848957e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/enum_test.pyi
@@ -33,7 +33,7 @@ class EnumTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "enum_string_required",
         }
@@ -131,19 +131,19 @@ class EnumTest(
                 "IntegerEnumOneValue": integer_enum_one_value,
             }
     
-    enum_string_required: MetaOapg.Properties.EnumStringRequired
+    enum_string_required: Schema_.Properties.EnumStringRequired
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.Properties.EnumStringRequired: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string_required"]) -> Schema_.Properties.EnumStringRequired: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> MetaOapg.Properties.EnumString: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_string"]) -> Schema_.Properties.EnumString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> MetaOapg.Properties.EnumInteger: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_integer"]) -> Schema_.Properties.EnumInteger: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> MetaOapg.Properties.EnumNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_number"]) -> Schema_.Properties.EnumNumber: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["stringEnum"]) -> 'string_enum.StringEnum': ...
@@ -182,36 +182,36 @@ class EnumTest(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_string_required"]) -> MetaOapg.Properties.EnumStringRequired: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_string_required"]) -> Schema_.Properties.EnumStringRequired: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[MetaOapg.Properties.EnumString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_string"]) -> typing.Union[Schema_.Properties.EnumString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[MetaOapg.Properties.EnumInteger, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_integer"]) -> typing.Union[Schema_.Properties.EnumInteger, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[MetaOapg.Properties.EnumNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_number"]) -> typing.Union[Schema_.Properties.EnumNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['string_enum.StringEnum', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["stringEnum"]) -> typing.Union['string_enum.StringEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['integer_enum.IntegerEnum', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnum"]) -> typing.Union['integer_enum.IntegerEnum', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["StringEnumWithDefaultValue"]) -> typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnumWithDefaultValue"]) -> typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["IntegerEnumOneValue"]) -> typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["enum_string_required"],
@@ -226,26 +226,26 @@ class EnumTest(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        enum_string_required: typing.Union[MetaOapg.Properties.EnumStringRequired, str, ],
-        enum_string: typing.Union[MetaOapg.Properties.EnumString, str, schemas.Unset] = schemas.unset,
-        enum_integer: typing.Union[MetaOapg.Properties.EnumInteger, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        enum_number: typing.Union[MetaOapg.Properties.EnumNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        enum_string_required: typing.Union[Schema_.Properties.EnumStringRequired, str, ],
+        enum_string: typing.Union[Schema_.Properties.EnumString, str, schemas.Unset] = schemas.unset,
+        enum_integer: typing.Union[Schema_.Properties.EnumInteger, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        enum_number: typing.Union[Schema_.Properties.EnumNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
         stringEnum: typing.Union['string_enum.StringEnum', schemas.Unset] = schemas.unset,
         IntegerEnum: typing.Union['integer_enum.IntegerEnum', schemas.Unset] = schemas.unset,
         StringEnumWithDefaultValue: typing.Union['string_enum_with_default_value.StringEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumWithDefaultValue: typing.Union['integer_enum_with_default_value.IntegerEnumWithDefaultValue', schemas.Unset] = schemas.unset,
         IntegerEnumOneValue: typing.Union['integer_enum_one_value.IntegerEnumOneValue', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EnumTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             enum_string_required=enum_string_required,
             enum_string=enum_string,
             enum_integer=enum_integer,
@@ -255,7 +255,7 @@ class EnumTest(
             StringEnumWithDefaultValue=StringEnumWithDefaultValue,
             IntegerEnumWithDefaultValue=IntegerEnumWithDefaultValue,
             IntegerEnumOneValue=IntegerEnumOneValue,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.py
index 9e7f3cf4e23..ae3cacda27c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.py
@@ -33,7 +33,7 @@ class EquilateralTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -59,7 +59,7 @@ class TriangleType(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -75,7 +75,7 @@ def EQUILATERAL_TRIANGLE(cls):
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,32 +91,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -127,14 +127,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.pyi
index eab5c1247cc..b62ba59a075 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/equilateral_triangle.pyi
@@ -33,7 +33,7 @@ class EquilateralTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class EquilateralTriangle(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         
@@ -65,7 +65,7 @@ class EquilateralTriangle(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,32 +81,32 @@ class EquilateralTriangle(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -117,14 +117,14 @@ class EquilateralTriangle(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'EquilateralTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.py
index 7e73d2d5df3..c08e08c406d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.py
@@ -35,7 +35,7 @@ class File(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,7 +45,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> MetaOapg.Properties.SourceURI: ...
+    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> Schema_.Properties.SourceURI: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -61,31 +61,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[MetaOapg.Properties.SourceURI, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[Schema_.Properties.SourceURI, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["sourceURI"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        sourceURI: typing.Union[MetaOapg.Properties.SourceURI, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        sourceURI: typing.Union[Schema_.Properties.SourceURI, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'File':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             sourceURI=sourceURI,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.pyi
index c153f1fe340..e160f2f40a8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file.pyi
@@ -35,7 +35,7 @@ class File(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             SourceURI = schemas.StrSchema
@@ -44,7 +44,7 @@ class File(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> MetaOapg.Properties.SourceURI: ...
+    def __getitem__(self, name: typing_extensions.Literal["sourceURI"]) -> Schema_.Properties.SourceURI: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ class File(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[MetaOapg.Properties.SourceURI, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["sourceURI"]) -> typing.Union[Schema_.Properties.SourceURI, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["sourceURI"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        sourceURI: typing.Union[MetaOapg.Properties.SourceURI, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        sourceURI: typing.Union[Schema_.Properties.SourceURI, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'File':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             sourceURI=sourceURI,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.py
index 7c8590f25de..c9e59e539da 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.py
@@ -33,7 +33,7 @@ class FileSchemaTestClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -48,7 +48,7 @@ class Files(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -57,13 +57,13 @@ def items() -> typing.Type['file.File']:
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['file.File'], typing.List['file.File']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['file.File'], typing.List['file.File']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Files':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'file.File':
@@ -77,7 +77,7 @@ def __getitem__(self, i: int) -> 'file.File':
     def __getitem__(self, name: typing_extensions.Literal["file"]) -> 'file.File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.Properties.Files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> Schema_.Properties.Files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -94,15 +94,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union['file.File', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> typing.Union['file.File', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.Properties.Files, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["files"]) -> typing.Union[Schema_.Properties.Files, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["file"],
@@ -110,22 +110,22 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         file: typing.Union['file.File', schemas.Unset] = schemas.unset,
-        files: typing.Union[MetaOapg.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        files: typing.Union[Schema_.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             file=file,
             files=files,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.pyi
index 31e5cffd8fb..680864ae2e2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/file_schema_test_class.pyi
@@ -33,7 +33,7 @@ class FileSchemaTestClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -47,7 +47,7 @@ class FileSchemaTestClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -56,13 +56,13 @@ class FileSchemaTestClass(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['file.File'], typing.List['file.File']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['file.File'], typing.List['file.File']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Files':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'file.File':
@@ -76,7 +76,7 @@ class FileSchemaTestClass(
     def __getitem__(self, name: typing_extensions.Literal["file"]) -> 'file.File': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.Properties.Files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> Schema_.Properties.Files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -93,15 +93,15 @@ class FileSchemaTestClass(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union['file.File', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> typing.Union['file.File', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.Properties.Files, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["files"]) -> typing.Union[Schema_.Properties.Files, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["file"],
@@ -109,22 +109,22 @@ class FileSchemaTestClass(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         file: typing.Union['file.File', schemas.Unset] = schemas.unset,
-        files: typing.Union[MetaOapg.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        files: typing.Union[Schema_.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FileSchemaTestClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             file=file,
             files=files,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.py
index 8cf1842f23a..a312c5b7f20 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.py
@@ -33,7 +33,7 @@ class Foo(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -62,32 +62,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union['bar.Bar', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union['bar.Bar', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union['bar.Bar', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Foo':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.pyi
index 138b2f38771..a372d9c6f4e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/foo.pyi
@@ -33,7 +33,7 @@ class Foo(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -61,32 +61,32 @@ class Foo(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union['bar.Bar', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union['bar.Bar', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         bar: typing.Union['bar.Bar', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Foo':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.py
index 6703af59e5f..ef5ea77b549 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.py
@@ -33,7 +33,7 @@ class FormatTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "byte",
@@ -50,7 +50,7 @@ class Integer(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -66,7 +66,7 @@ class Int32withValidations(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -81,7 +81,7 @@ class Number(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -95,7 +95,7 @@ class _Float(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -110,7 +110,7 @@ class Double(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -125,23 +125,23 @@ class ArrayWithUniqueItems(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     unique_items = True
                     Items = schemas.NumberSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayWithUniqueItems':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -150,7 +150,7 @@ class String(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -173,7 +173,7 @@ class Password(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -187,7 +187,7 @@ class PatternWithDigits(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -201,7 +201,7 @@ class PatternWithDigitsAndDelimiter(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -236,73 +236,73 @@ class MetaOapg:
                 "noneProp": NoneProp,
             }
     
-    byte: MetaOapg.Properties.Byte
-    date: MetaOapg.Properties.Date
-    number: MetaOapg.Properties.Number
-    password: MetaOapg.Properties.Password
+    byte: Schema_.Properties.Byte
+    date: Schema_.Properties.Date
+    number: Schema_.Properties.Number
+    password: Schema_.Properties.Password
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.Properties.Integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> Schema_.Properties.Integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> MetaOapg.Properties.Int32withValidations: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> Schema_.Properties.Int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> MetaOapg.Properties.Float32: ...
+    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> Schema_.Properties.Float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> MetaOapg.Properties.Float64: ...
+    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> Schema_.Properties.Float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> MetaOapg.Properties.ArrayWithUniqueItems: ...
+    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> Schema_.Properties.ArrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.Properties.String: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> Schema_.Properties.String: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> MetaOapg.Properties.UuidNoExample: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> Schema_.Properties.UuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> MetaOapg.Properties.PatternWithDigits: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> Schema_.Properties.PatternWithDigits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.Properties.PatternWithDigitsAndDelimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> Schema_.Properties.PatternWithDigitsAndDelimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> MetaOapg.Properties.NoneProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> Schema_.Properties.NoneProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -338,72 +338,72 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def get_item_(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.Properties.Integer, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer"]) -> typing.Union[Schema_.Properties.Integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[MetaOapg.Properties.Int32withValidations, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[Schema_.Properties.Int32withValidations, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float32"]) -> typing.Union[MetaOapg.Properties.Float32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float32"]) -> typing.Union[Schema_.Properties.Float32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.Properties.Double, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> typing.Union[Schema_.Properties.Double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float64"]) -> typing.Union[MetaOapg.Properties.Float64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float64"]) -> typing.Union[Schema_.Properties.Float64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.Properties.ArrayWithUniqueItems, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[Schema_.Properties.ArrayWithUniqueItems, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.Properties.String, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union[Schema_.Properties.String, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.Properties.UuidNoExample, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[Schema_.Properties.UuidNoExample, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.Properties.PatternWithDigits, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[Schema_.Properties.PatternWithDigits, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.Properties.PatternWithDigitsAndDelimiter, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[Schema_.Properties.PatternWithDigitsAndDelimiter, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[MetaOapg.Properties.NoneProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[Schema_.Properties.NoneProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["byte"],
@@ -430,37 +430,37 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        byte: typing.Union[MetaOapg.Properties.Byte, str, ],
-        date: typing.Union[MetaOapg.Properties.Date, str, datetime.date, ],
-        number: typing.Union[MetaOapg.Properties.Number, decimal.Decimal, int, float, ],
-        password: typing.Union[MetaOapg.Properties.Password, str, ],
-        integer: typing.Union[MetaOapg.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32withValidations: typing.Union[MetaOapg.Properties.Int32withValidations, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        float32: typing.Union[MetaOapg.Properties.Float32, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        double: typing.Union[MetaOapg.Properties.Double, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        float64: typing.Union[MetaOapg.Properties.Float64, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        arrayWithUniqueItems: typing.Union[MetaOapg.Properties.ArrayWithUniqueItems, list, tuple, schemas.Unset] = schemas.unset,
-        string: typing.Union[MetaOapg.Properties.String, str, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        uuid: typing.Union[MetaOapg.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        uuidNoExample: typing.Union[MetaOapg.Properties.UuidNoExample, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        pattern_with_digits: typing.Union[MetaOapg.Properties.PatternWithDigits, str, schemas.Unset] = schemas.unset,
-        pattern_with_digits_and_delimiter: typing.Union[MetaOapg.Properties.PatternWithDigitsAndDelimiter, str, schemas.Unset] = schemas.unset,
-        noneProp: typing.Union[MetaOapg.Properties.NoneProp, None, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        byte: typing.Union[Schema_.Properties.Byte, str, ],
+        date: typing.Union[Schema_.Properties.Date, str, datetime.date, ],
+        number: typing.Union[Schema_.Properties.Number, decimal.Decimal, int, float, ],
+        password: typing.Union[Schema_.Properties.Password, str, ],
+        integer: typing.Union[Schema_.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32withValidations: typing.Union[Schema_.Properties.Int32withValidations, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        float32: typing.Union[Schema_.Properties.Float32, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        double: typing.Union[Schema_.Properties.Double, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        float64: typing.Union[Schema_.Properties.Float64, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        arrayWithUniqueItems: typing.Union[Schema_.Properties.ArrayWithUniqueItems, list, tuple, schemas.Unset] = schemas.unset,
+        string: typing.Union[Schema_.Properties.String, str, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        uuid: typing.Union[Schema_.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        uuidNoExample: typing.Union[Schema_.Properties.UuidNoExample, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        pattern_with_digits: typing.Union[Schema_.Properties.PatternWithDigits, str, schemas.Unset] = schemas.unset,
+        pattern_with_digits_and_delimiter: typing.Union[Schema_.Properties.PatternWithDigitsAndDelimiter, str, schemas.Unset] = schemas.unset,
+        noneProp: typing.Union[Schema_.Properties.NoneProp, None, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             byte=byte,
             date=date,
             number=number,
@@ -481,6 +481,6 @@ def __new__(
             pattern_with_digits=pattern_with_digits,
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.pyi
index 98d6718c606..c6918ee0ec3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/format_test.pyi
@@ -33,7 +33,7 @@ class FormatTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "byte",
             "date",
@@ -83,23 +83,23 @@ class FormatTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     unique_items = True
                     Items = schemas.NumberSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[MetaOapg.Items, decimal.Decimal, int, float, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]], typing.List[typing.Union[Schema_.Items, decimal.Decimal, int, float, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayWithUniqueItems':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -156,73 +156,73 @@ class FormatTest(
                 "noneProp": NoneProp,
             }
     
-    byte: MetaOapg.Properties.Byte
-    date: MetaOapg.Properties.Date
-    number: MetaOapg.Properties.Number
-    password: MetaOapg.Properties.Password
+    byte: Schema_.Properties.Byte
+    date: Schema_.Properties.Date
+    number: Schema_.Properties.Number
+    password: Schema_.Properties.Password
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.Properties.Integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> Schema_.Properties.Integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> MetaOapg.Properties.Int32withValidations: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32withValidations"]) -> Schema_.Properties.Int32withValidations: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> MetaOapg.Properties.Float32: ...
+    def __getitem__(self, name: typing_extensions.Literal["float32"]) -> Schema_.Properties.Float32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> MetaOapg.Properties.Float64: ...
+    def __getitem__(self, name: typing_extensions.Literal["float64"]) -> Schema_.Properties.Float64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> MetaOapg.Properties.ArrayWithUniqueItems: ...
+    def __getitem__(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> Schema_.Properties.ArrayWithUniqueItems: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.Properties.String: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> Schema_.Properties.String: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> MetaOapg.Properties.UuidNoExample: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuidNoExample"]) -> Schema_.Properties.UuidNoExample: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> MetaOapg.Properties.PatternWithDigits: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits"]) -> Schema_.Properties.PatternWithDigits: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> MetaOapg.Properties.PatternWithDigitsAndDelimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> Schema_.Properties.PatternWithDigitsAndDelimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> MetaOapg.Properties.NoneProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["noneProp"]) -> Schema_.Properties.NoneProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -258,72 +258,72 @@ class FormatTest(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def get_item_(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.Properties.Integer, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer"]) -> typing.Union[Schema_.Properties.Integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[MetaOapg.Properties.Int32withValidations, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32withValidations"]) -> typing.Union[Schema_.Properties.Int32withValidations, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float32"]) -> typing.Union[MetaOapg.Properties.Float32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float32"]) -> typing.Union[Schema_.Properties.Float32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> typing.Union[MetaOapg.Properties.Double, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> typing.Union[Schema_.Properties.Double, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float64"]) -> typing.Union[MetaOapg.Properties.Float64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float64"]) -> typing.Union[Schema_.Properties.Float64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[MetaOapg.Properties.ArrayWithUniqueItems, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["arrayWithUniqueItems"]) -> typing.Union[Schema_.Properties.ArrayWithUniqueItems, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.Properties.String, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union[Schema_.Properties.String, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[MetaOapg.Properties.UuidNoExample, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuidNoExample"]) -> typing.Union[Schema_.Properties.UuidNoExample, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[MetaOapg.Properties.PatternWithDigits, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_with_digits"]) -> typing.Union[Schema_.Properties.PatternWithDigits, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[MetaOapg.Properties.PatternWithDigitsAndDelimiter, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_with_digits_and_delimiter"]) -> typing.Union[Schema_.Properties.PatternWithDigitsAndDelimiter, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[MetaOapg.Properties.NoneProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["noneProp"]) -> typing.Union[Schema_.Properties.NoneProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["byte"],
@@ -350,37 +350,37 @@ class FormatTest(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        byte: typing.Union[MetaOapg.Properties.Byte, str, ],
-        date: typing.Union[MetaOapg.Properties.Date, str, datetime.date, ],
-        number: typing.Union[MetaOapg.Properties.Number, decimal.Decimal, int, float, ],
-        password: typing.Union[MetaOapg.Properties.Password, str, ],
-        integer: typing.Union[MetaOapg.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32withValidations: typing.Union[MetaOapg.Properties.Int32withValidations, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        float32: typing.Union[MetaOapg.Properties.Float32, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        double: typing.Union[MetaOapg.Properties.Double, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        float64: typing.Union[MetaOapg.Properties.Float64, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        arrayWithUniqueItems: typing.Union[MetaOapg.Properties.ArrayWithUniqueItems, list, tuple, schemas.Unset] = schemas.unset,
-        string: typing.Union[MetaOapg.Properties.String, str, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        uuid: typing.Union[MetaOapg.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        uuidNoExample: typing.Union[MetaOapg.Properties.UuidNoExample, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        pattern_with_digits: typing.Union[MetaOapg.Properties.PatternWithDigits, str, schemas.Unset] = schemas.unset,
-        pattern_with_digits_and_delimiter: typing.Union[MetaOapg.Properties.PatternWithDigitsAndDelimiter, str, schemas.Unset] = schemas.unset,
-        noneProp: typing.Union[MetaOapg.Properties.NoneProp, None, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        byte: typing.Union[Schema_.Properties.Byte, str, ],
+        date: typing.Union[Schema_.Properties.Date, str, datetime.date, ],
+        number: typing.Union[Schema_.Properties.Number, decimal.Decimal, int, float, ],
+        password: typing.Union[Schema_.Properties.Password, str, ],
+        integer: typing.Union[Schema_.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32withValidations: typing.Union[Schema_.Properties.Int32withValidations, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        float32: typing.Union[Schema_.Properties.Float32, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        double: typing.Union[Schema_.Properties.Double, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        float64: typing.Union[Schema_.Properties.Float64, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        arrayWithUniqueItems: typing.Union[Schema_.Properties.ArrayWithUniqueItems, list, tuple, schemas.Unset] = schemas.unset,
+        string: typing.Union[Schema_.Properties.String, str, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        uuid: typing.Union[Schema_.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        uuidNoExample: typing.Union[Schema_.Properties.UuidNoExample, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        pattern_with_digits: typing.Union[Schema_.Properties.PatternWithDigits, str, schemas.Unset] = schemas.unset,
+        pattern_with_digits_and_delimiter: typing.Union[Schema_.Properties.PatternWithDigitsAndDelimiter, str, schemas.Unset] = schemas.unset,
+        noneProp: typing.Union[Schema_.Properties.NoneProp, None, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FormatTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             byte=byte,
             date=date,
             number=number,
@@ -401,6 +401,6 @@ class FormatTest(
             pattern_with_digits=pattern_with_digits,
             pattern_with_digits_and_delimiter=pattern_with_digits_and_delimiter,
             noneProp=noneProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.py
index 104608ab312..42a0590d4e4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.py
@@ -33,7 +33,7 @@ class FromSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,10 +45,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["data"]) -> MetaOapg.Properties.Data: ...
+    def __getitem__(self, name: typing_extensions.Literal["data"]) -> Schema_.Properties.Data: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["data"]) -> typing.Union[MetaOapg.Properties.Data, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["data"]) -> typing.Union[Schema_.Properties.Data, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["data"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        data: typing.Union[MetaOapg.Properties.Data, str, schemas.Unset] = schemas.unset,
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        data: typing.Union[Schema_.Properties.Data, str, schemas.Unset] = schemas.unset,
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FromSchema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             data=data,
             id=id,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.pyi
index abc586916cb..5f4a71e9258 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/from_schema.pyi
@@ -33,7 +33,7 @@ class FromSchema(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Data = schemas.StrSchema
@@ -44,10 +44,10 @@ class FromSchema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["data"]) -> MetaOapg.Properties.Data: ...
+    def __getitem__(self, name: typing_extensions.Literal["data"]) -> Schema_.Properties.Data: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class FromSchema(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["data"]) -> typing.Union[MetaOapg.Properties.Data, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["data"]) -> typing.Union[Schema_.Properties.Data, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["data"],
@@ -80,21 +80,21 @@ class FromSchema(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        data: typing.Union[MetaOapg.Properties.Data, str, schemas.Unset] = schemas.unset,
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        data: typing.Union[Schema_.Properties.Data, str, schemas.Unset] = schemas.unset,
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FromSchema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             data=data,
             id=id,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.py
index 756e37dd0ad..d5c2d3e819b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.py
@@ -33,7 +33,7 @@ class Fruit(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -58,7 +58,7 @@ def one_of1() -> typing.Type['banana.Banana']:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["color"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Fruit':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.pyi
index 756e37dd0ad..d5c2d3e819b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit.pyi
@@ -33,7 +33,7 @@ class Fruit(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -58,7 +58,7 @@ class Fruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ class Fruit(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["color"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Fruit':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.py
index 59f6564223e..dd675cf2c50 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.py
@@ -33,7 +33,7 @@ class FruitReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -55,14 +55,14 @@ def one_of2() -> typing.Type['banana_req.BananaReq']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.pyi
index 59f6564223e..dd675cf2c50 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/fruit_req.pyi
@@ -33,7 +33,7 @@ class FruitReq(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -55,14 +55,14 @@ class FruitReq(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'FruitReq':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.py
index 3f0e6959465..70c8f5d9aed 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.py
@@ -33,7 +33,7 @@ class GmFruit(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -58,7 +58,7 @@ def any_of1() -> typing.Type['banana.Banana']:
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["color"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.pyi
index 3f0e6959465..70c8f5d9aed 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/gm_fruit.pyi
@@ -33,7 +33,7 @@ class GmFruit(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class Properties:
@@ -58,7 +58,7 @@ class GmFruit(
 
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["color"]) -> MetaOapg.Properties.Color: ...
+    def __getitem__(self, name: typing_extensions.Literal["color"]) -> Schema_.Properties.Color: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -74,32 +74,32 @@ class GmFruit(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["color"]) -> typing.Union[MetaOapg.Properties.Color, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["color"]) -> typing.Union[Schema_.Properties.Color, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["color"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        color: typing.Union[MetaOapg.Properties.Color, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        color: typing.Union[Schema_.Properties.Color, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'GmFruit':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             color=color,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.py
index ea3d8c31ba5..87ccdeb62ae 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.py
@@ -33,7 +33,7 @@ class GrandparentAnimal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "pet_type",
@@ -54,10 +54,10 @@ class Properties:
                 "pet_type": PetType,
             }
     
-    pet_type: MetaOapg.Properties.PetType
+    pet_type: Schema_.Properties.PetType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.Properties.PetType: ...
+    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> Schema_.Properties.PetType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -73,32 +73,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.Properties.PetType: ...
+    def get_item_(self, name: typing_extensions.Literal["pet_type"]) -> Schema_.Properties.PetType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["pet_type"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        pet_type: typing.Union[MetaOapg.Properties.PetType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        pet_type: typing.Union[Schema_.Properties.PetType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             pet_type=pet_type,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.pyi
index 6cd0b979682..e3d444f4164 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/grandparent_animal.pyi
@@ -33,7 +33,7 @@ class GrandparentAnimal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "pet_type",
         }
@@ -53,10 +53,10 @@ class GrandparentAnimal(
                 "pet_type": PetType,
             }
     
-    pet_type: MetaOapg.Properties.PetType
+    pet_type: Schema_.Properties.PetType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.Properties.PetType: ...
+    def __getitem__(self, name: typing_extensions.Literal["pet_type"]) -> Schema_.Properties.PetType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -72,32 +72,32 @@ class GrandparentAnimal(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pet_type"]) -> MetaOapg.Properties.PetType: ...
+    def get_item_(self, name: typing_extensions.Literal["pet_type"]) -> Schema_.Properties.PetType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["pet_type"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        pet_type: typing.Union[MetaOapg.Properties.PetType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        pet_type: typing.Union[Schema_.Properties.PetType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'GrandparentAnimal':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             pet_type=pet_type,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.py
index 3cd0549188a..9b0bdb118f8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.py
@@ -33,7 +33,7 @@ class HasOnlyReadOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,10 +45,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.pyi
index 803256277d9..adecfb6bbf3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/has_only_read_only.pyi
@@ -33,7 +33,7 @@ class HasOnlyReadOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Bar = schemas.StrSchema
@@ -44,10 +44,10 @@ class HasOnlyReadOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> MetaOapg.Properties.Foo: ...
+    def __getitem__(self, name: typing_extensions.Literal["foo"]) -> Schema_.Properties.Foo: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class HasOnlyReadOnly(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["foo"]) -> typing.Union[MetaOapg.Properties.Foo, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["foo"]) -> typing.Union[Schema_.Properties.Foo, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -80,21 +80,21 @@ class HasOnlyReadOnly(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        foo: typing.Union[MetaOapg.Properties.Foo, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        foo: typing.Union[Schema_.Properties.Foo, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HasOnlyReadOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             foo=foo,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.py
index a314ee6899f..7ae7e522df4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.py
@@ -35,7 +35,7 @@ class HealthCheckResult(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -49,7 +49,7 @@ class NullableMessage(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -58,20 +58,20 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'NullableMessage':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> MetaOapg.Properties.NullableMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> Schema_.Properties.NullableMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -87,31 +87,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[MetaOapg.Properties.NullableMessage, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[Schema_.Properties.NullableMessage, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["NullableMessage"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        NullableMessage: typing.Union[MetaOapg.Properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        NullableMessage: typing.Union[Schema_.Properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             NullableMessage=NullableMessage,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.pyi
index af427bb80a7..0e6c0e3dec8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/health_check_result.pyi
@@ -35,7 +35,7 @@ class HealthCheckResult(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -48,7 +48,7 @@ class HealthCheckResult(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -57,20 +57,20 @@ class HealthCheckResult(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'NullableMessage':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             __annotations__ = {
                 "NullableMessage": NullableMessage,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> MetaOapg.Properties.NullableMessage: ...
+    def __getitem__(self, name: typing_extensions.Literal["NullableMessage"]) -> Schema_.Properties.NullableMessage: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -86,31 +86,31 @@ class HealthCheckResult(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[MetaOapg.Properties.NullableMessage, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["NullableMessage"]) -> typing.Union[Schema_.Properties.NullableMessage, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["NullableMessage"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        NullableMessage: typing.Union[MetaOapg.Properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        NullableMessage: typing.Union[Schema_.Properties.NullableMessage, None, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'HealthCheckResult':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             NullableMessage=NullableMessage,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum.py
index c16ac136b6c..6e0ff3b8ca6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum.py
@@ -33,7 +33,7 @@ class IntegerEnum(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_big.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_big.py
index 19fbd172b05..9e5c9df7395 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_big.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_big.py
@@ -33,7 +33,7 @@ class IntegerEnumBig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_one_value.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_one_value.py
index d28f7f0fe02..9199b6cc796 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_one_value.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_one_value.py
@@ -33,7 +33,7 @@ class IntegerEnumOneValue(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_with_default_value.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_with_default_value.py
index e0e51df9600..58ee4033d63 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_enum_with_default_value.py
@@ -33,7 +33,7 @@ class IntegerEnumWithDefaultValue(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_max10.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_max10.py
index d48a571dfd8..ec446098276 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_max10.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_max10.py
@@ -33,7 +33,7 @@ class IntegerMax10(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_min15.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_min15.py
index 2be4d93900b..0b0842e8b9e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_min15.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/integer_min15.py
@@ -33,7 +33,7 @@ class IntegerMin15(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.py
index 412ba33623e..af9d42226a6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.py
@@ -33,7 +33,7 @@ class IsoscelesTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -59,7 +59,7 @@ class TriangleType(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -75,7 +75,7 @@ def ISOSCELES_TRIANGLE(cls):
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,32 +91,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -127,14 +127,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.pyi
index e045968c386..58458dd52a6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/isosceles_triangle.pyi
@@ -33,7 +33,7 @@ class IsoscelesTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class IsoscelesTriangle(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         
@@ -65,7 +65,7 @@ class IsoscelesTriangle(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,32 +81,32 @@ class IsoscelesTriangle(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -117,14 +117,14 @@ class IsoscelesTriangle(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'IsoscelesTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.py
index f077592790f..ba7b786a7f1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.py
@@ -33,7 +33,7 @@ class JSONPatchRequest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -42,7 +42,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 # any type
                 
                 class OneOf:
@@ -67,29 +67,29 @@ def one_of2() -> typing.Type['json_patch_request_move_copy.JSONPatchRequestMoveC
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> 'Items':
                 return super().__new__(
                     cls,
-                    *_args,
-                    _configuration=_configuration,
+                    *args_,
+                    configuration_=configuration_,
                     **kwargs,
                 )
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequest':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
 
 from petstore_api.components.schema import json_patch_request_add_replace_test
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.pyi
index f077592790f..ba7b786a7f1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request.pyi
@@ -33,7 +33,7 @@ class JSONPatchRequest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -42,7 +42,7 @@ class JSONPatchRequest(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 # any type
                 
                 class OneOf:
@@ -67,29 +67,29 @@ class JSONPatchRequest(
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> 'Items':
                 return super().__new__(
                     cls,
-                    *_args,
-                    _configuration=_configuration,
+                    *args_,
+                    configuration_=configuration_,
                     **kwargs,
                 )
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequest':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
 
 from petstore_api.components.schema import json_patch_request_add_replace_test
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.py
index 40e9aa6e30e..316c8f70de5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.py
@@ -33,7 +33,7 @@ class JSONPatchRequestAddReplaceTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "op",
@@ -51,7 +51,7 @@ class Op(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -79,18 +79,18 @@ def TEST(cls):
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
-    value: MetaOapg.Properties.Value
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
+    value: Schema_.Properties.Value
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["value"]) -> MetaOapg.Properties.Value: ...
+    def __getitem__(self, name: typing_extensions.Literal["value"]) -> Schema_.Properties.Value: ...
     
     def __getitem__(
         self,
@@ -104,15 +104,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["value"]) -> MetaOapg.Properties.Value: ...
+    def get_item_(self, name: typing_extensions.Literal["value"]) -> Schema_.Properties.Value: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["op"],
@@ -120,21 +120,21 @@ def get_item_oapg(
             typing_extensions.Literal["value"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        value: typing.Union[MetaOapg.Properties.Value, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        value: typing.Union[Schema_.Properties.Value, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestAddReplaceTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
             value=value,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.pyi
index 1abacb913d9..b3f2d168f38 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_add_replace_test.pyi
@@ -33,7 +33,7 @@ class JSONPatchRequestAddReplaceTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "op",
             "path",
@@ -67,18 +67,18 @@ class JSONPatchRequestAddReplaceTest(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
-    value: MetaOapg.Properties.Value
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
+    value: Schema_.Properties.Value
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["value"]) -> MetaOapg.Properties.Value: ...
+    def __getitem__(self, name: typing_extensions.Literal["value"]) -> Schema_.Properties.Value: ...
     
     def __getitem__(
         self,
@@ -92,15 +92,15 @@ class JSONPatchRequestAddReplaceTest(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["value"]) -> MetaOapg.Properties.Value: ...
+    def get_item_(self, name: typing_extensions.Literal["value"]) -> Schema_.Properties.Value: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["op"],
@@ -108,21 +108,21 @@ class JSONPatchRequestAddReplaceTest(
             typing_extensions.Literal["value"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        value: typing.Union[MetaOapg.Properties.Value, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        value: typing.Union[Schema_.Properties.Value, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestAddReplaceTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
             value=value,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.py
index 72a23be5fd3..6f3df306a17 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.py
@@ -33,7 +33,7 @@ class JSONPatchRequestMoveCopy(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "from",
@@ -51,7 +51,7 @@ class Op(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -74,17 +74,17 @@ def COPY(cls):
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["from"]) -> MetaOapg.Properties._From: ...
+    def __getitem__(self, name: typing_extensions.Literal["from"]) -> Schema_.Properties._From: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     def __getitem__(
         self,
@@ -98,15 +98,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> MetaOapg.Properties._From: ...
+    def get_item_(self, name: typing_extensions.Literal["from"]) -> Schema_.Properties._From: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["from"],
@@ -114,19 +114,19 @@ def get_item_oapg(
             typing_extensions.Literal["path"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestMoveCopy':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.pyi
index 8cde2f69d8b..f95d7b7e630 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_move_copy.pyi
@@ -33,7 +33,7 @@ class JSONPatchRequestMoveCopy(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "from",
             "op",
@@ -63,17 +63,17 @@ class JSONPatchRequestMoveCopy(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["from"]) -> MetaOapg.Properties._From: ...
+    def __getitem__(self, name: typing_extensions.Literal["from"]) -> Schema_.Properties._From: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     def __getitem__(
         self,
@@ -87,15 +87,15 @@ class JSONPatchRequestMoveCopy(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> MetaOapg.Properties._From: ...
+    def get_item_(self, name: typing_extensions.Literal["from"]) -> Schema_.Properties._From: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["from"],
@@ -103,19 +103,19 @@ class JSONPatchRequestMoveCopy(
             typing_extensions.Literal["path"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestMoveCopy':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.py
index ff7d65b3392..d2b2608e230 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.py
@@ -33,7 +33,7 @@ class JSONPatchRequestRemove(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "op",
@@ -49,7 +49,7 @@ class Op(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -66,14 +66,14 @@ def REMOVE(cls):
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     def __getitem__(
         self,
@@ -86,31 +86,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["op"],
             typing_extensions.Literal["path"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestRemove':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.pyi
index e79a6359686..2a36b5f49a4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/json_patch_request_remove.pyi
@@ -33,7 +33,7 @@ class JSONPatchRequestRemove(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "op",
             "path",
@@ -56,14 +56,14 @@ class JSONPatchRequestRemove(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    op: MetaOapg.Properties.Op
-    path: MetaOapg.Properties.Path
+    op: Schema_.Properties.Op
+    path: Schema_.Properties.Path
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def __getitem__(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def __getitem__(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
     def __getitem__(
         self,
@@ -76,31 +76,31 @@ class JSONPatchRequestRemove(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["op"]) -> MetaOapg.Properties.Op: ...
+    def get_item_(self, name: typing_extensions.Literal["op"]) -> Schema_.Properties.Op: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["path"]) -> MetaOapg.Properties.Path: ...
+    def get_item_(self, name: typing_extensions.Literal["path"]) -> Schema_.Properties.Path: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["op"],
             typing_extensions.Literal["path"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        op: typing.Union[MetaOapg.Properties.Op, str, ],
-        path: typing.Union[MetaOapg.Properties.Path, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        op: typing.Union[Schema_.Properties.Op, str, ],
+        path: typing.Union[Schema_.Properties.Path, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'JSONPatchRequestRemove':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             op=op,
             path=path,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.py
index 51da6f7e3cb..05f4961ecb7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.py
@@ -33,7 +33,7 @@ class Mammal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -68,14 +68,14 @@ def one_of2() -> typing.Type['pig.Pig']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Mammal':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.pyi
index 51da6f7e3cb..05f4961ecb7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mammal.pyi
@@ -33,7 +33,7 @@ class Mammal(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -68,14 +68,14 @@ class Mammal(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Mammal':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.py
index 95c5f0f7ef7..bcbdb7a048c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.py
@@ -33,7 +33,7 @@ class MapTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,7 +44,7 @@ class MapMapOfString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -53,47 +53,47 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {frozendict.frozendict}
                             AdditionalProperties = schemas.StrSchema
                         
-                        def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                        def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
-                        def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                            return super().get_item_oapg(name)
+                        def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                            return super().get_item_(name)
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                            *args_: typing.Union[dict, frozendict.frozendict, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'MapMapOfString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -103,7 +103,7 @@ class MapOfEnumString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -112,7 +112,7 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 str,
                             }
@@ -129,23 +129,23 @@ def UPPER(cls):
                         def LOWER(cls):
                             return cls("lower")
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapOfEnumString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -155,27 +155,27 @@ class DirectMap(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     AdditionalProperties = schemas.BoolSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
                 ) -> 'DirectMap':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
         
@@ -190,13 +190,13 @@ def indirect_map() -> typing.Type['string_boolean_map.StringBooleanMap']:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> MetaOapg.Properties.MapMapOfString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> Schema_.Properties.MapMapOfString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> MetaOapg.Properties.MapOfEnumString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> Schema_.Properties.MapOfEnumString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> MetaOapg.Properties.DirectMap: ...
+    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> Schema_.Properties.DirectMap: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["indirect_map"]) -> 'string_boolean_map.StringBooleanMap': ...
@@ -218,21 +218,21 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.Properties.MapMapOfString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[Schema_.Properties.MapMapOfString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.Properties.MapOfEnumString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[Schema_.Properties.MapOfEnumString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[MetaOapg.Properties.DirectMap, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[Schema_.Properties.DirectMap, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["map_map_of_string"],
@@ -242,26 +242,26 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        map_map_of_string: typing.Union[MetaOapg.Properties.MapMapOfString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_of_enum_string: typing.Union[MetaOapg.Properties.MapOfEnumString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        direct_map: typing.Union[MetaOapg.Properties.DirectMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        map_map_of_string: typing.Union[Schema_.Properties.MapMapOfString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_of_enum_string: typing.Union[Schema_.Properties.MapOfEnumString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        direct_map: typing.Union[Schema_.Properties.DirectMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MapTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             map_map_of_string=map_map_of_string,
             map_of_enum_string=map_of_enum_string,
             direct_map=direct_map,
             indirect_map=indirect_map,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.pyi
index cef6092d940..3d6e5638c0b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/map_test.pyi
@@ -33,7 +33,7 @@ class MapTest(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,7 +43,7 @@ class MapTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -51,46 +51,46 @@ class MapTest(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             AdditionalProperties = schemas.StrSchema
                         
-                        def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                        def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                             # dict_instance[name] accessor
                             return super().__getitem__(name)
                         
-                        def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                            return super().get_item_oapg(name)
+                        def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                            return super().get_item_(name)
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                            **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                            *args_: typing.Union[dict, frozendict.frozendict, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'MapMapOfString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -100,7 +100,7 @@ class MapTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -115,23 +115,23 @@ class MapTest(
                         def LOWER(cls):
                             return cls("lower")
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
                 ) -> 'MapOfEnumString':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -141,26 +141,26 @@ class MapTest(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     AdditionalProperties = schemas.BoolSchema
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
                 ) -> 'DirectMap':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
         
@@ -175,13 +175,13 @@ class MapTest(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> MetaOapg.Properties.MapMapOfString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_map_of_string"]) -> Schema_.Properties.MapMapOfString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> MetaOapg.Properties.MapOfEnumString: ...
+    def __getitem__(self, name: typing_extensions.Literal["map_of_enum_string"]) -> Schema_.Properties.MapOfEnumString: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> MetaOapg.Properties.DirectMap: ...
+    def __getitem__(self, name: typing_extensions.Literal["direct_map"]) -> Schema_.Properties.DirectMap: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["indirect_map"]) -> 'string_boolean_map.StringBooleanMap': ...
@@ -203,21 +203,21 @@ class MapTest(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[MetaOapg.Properties.MapMapOfString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_map_of_string"]) -> typing.Union[Schema_.Properties.MapMapOfString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[MetaOapg.Properties.MapOfEnumString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map_of_enum_string"]) -> typing.Union[Schema_.Properties.MapOfEnumString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[MetaOapg.Properties.DirectMap, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["direct_map"]) -> typing.Union[Schema_.Properties.DirectMap, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["indirect_map"]) -> typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["map_map_of_string"],
@@ -227,26 +227,26 @@ class MapTest(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        map_map_of_string: typing.Union[MetaOapg.Properties.MapMapOfString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        map_of_enum_string: typing.Union[MetaOapg.Properties.MapOfEnumString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        direct_map: typing.Union[MetaOapg.Properties.DirectMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        map_map_of_string: typing.Union[Schema_.Properties.MapMapOfString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        map_of_enum_string: typing.Union[Schema_.Properties.MapOfEnumString, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        direct_map: typing.Union[Schema_.Properties.DirectMap, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
         indirect_map: typing.Union['string_boolean_map.StringBooleanMap', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MapTest':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             map_map_of_string=map_map_of_string,
             map_of_enum_string=map_of_enum_string,
             direct_map=direct_map,
             indirect_map=indirect_map,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
index c29bd041304..c9215f7e261 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.py
@@ -33,7 +33,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -46,7 +46,7 @@ class Map(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     @staticmethod
@@ -57,19 +57,19 @@ def __getitem__(self, name: str) -> 'animal.Animal':
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> 'animal.Animal':
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> 'animal.Animal':
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: 'animal.Animal',
                 ) -> 'Map':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -79,13 +79,13 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map"]) -> MetaOapg.Properties.Map: ...
+    def __getitem__(self, name: typing_extensions.Literal["map"]) -> Schema_.Properties.Map: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -103,18 +103,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map"]) -> typing.Union[MetaOapg.Properties.Map, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map"]) -> typing.Union[Schema_.Properties.Map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["uuid"],
@@ -123,24 +123,24 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        uuid: typing.Union[MetaOapg.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        map: typing.Union[MetaOapg.Properties.Map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        uuid: typing.Union[Schema_.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        map: typing.Union[Schema_.Properties.Map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             uuid=uuid,
             dateTime=dateTime,
             map=map,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.pyi
index e94ca3720a6..bc71a97be5d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/mixed_properties_and_additional_properties_class.pyi
@@ -33,7 +33,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Uuid = schemas.UUIDSchema
@@ -45,7 +45,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     @staticmethod
                     def additional_properties() -> typing.Type['animal.Animal']:
@@ -55,19 +55,19 @@ class MixedPropertiesAndAdditionalPropertiesClass(
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> 'animal.Animal':
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> 'animal.Animal':
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: 'animal.Animal',
                 ) -> 'Map':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -77,13 +77,13 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> MetaOapg.Properties.Uuid: ...
+    def __getitem__(self, name: typing_extensions.Literal["uuid"]) -> Schema_.Properties.Uuid: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["map"]) -> MetaOapg.Properties.Map: ...
+    def __getitem__(self, name: typing_extensions.Literal["map"]) -> Schema_.Properties.Map: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -101,18 +101,18 @@ class MixedPropertiesAndAdditionalPropertiesClass(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[MetaOapg.Properties.Uuid, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["uuid"]) -> typing.Union[Schema_.Properties.Uuid, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["map"]) -> typing.Union[MetaOapg.Properties.Map, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["map"]) -> typing.Union[Schema_.Properties.Map, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["uuid"],
@@ -121,24 +121,24 @@ class MixedPropertiesAndAdditionalPropertiesClass(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        uuid: typing.Union[MetaOapg.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        map: typing.Union[MetaOapg.Properties.Map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        uuid: typing.Union[Schema_.Properties.Uuid, str, uuid.UUID, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        map: typing.Union[Schema_.Properties.Map, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MixedPropertiesAndAdditionalPropertiesClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             uuid=uuid,
             dateTime=dateTime,
             map=map,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.py
index c3c76dd2afa..a3ed4ece8a0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.py
@@ -33,7 +33,7 @@ class Money(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "amount",
@@ -51,11 +51,11 @@ def currency() -> typing.Type['currency.Currency']:
                 "currency": currency,
             }
     
-    amount: MetaOapg.Properties.Amount
+    amount: Schema_.Properties.Amount
     currency: 'currency.Currency'
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.Properties.Amount: ...
+    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> Schema_.Properties.Amount: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
@@ -75,15 +75,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.Properties.Amount: ...
+    def get_item_(self, name: typing_extensions.Literal["amount"]) -> Schema_.Properties.Amount: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
+    def get_item_(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["amount"],
@@ -91,22 +91,22 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        amount: typing.Union[MetaOapg.Properties.Amount, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        amount: typing.Union[Schema_.Properties.Amount, str, ],
         currency: 'currency.Currency',
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Money':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             amount=amount,
             currency=currency,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.pyi
index ab418e3ed24..e9cf9612656 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/money.pyi
@@ -33,7 +33,7 @@ class Money(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "amount",
             "currency",
@@ -50,11 +50,11 @@ class Money(
                 "currency": currency,
             }
     
-    amount: MetaOapg.Properties.Amount
+    amount: Schema_.Properties.Amount
     currency: 'currency.Currency'
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.Properties.Amount: ...
+    def __getitem__(self, name: typing_extensions.Literal["amount"]) -> Schema_.Properties.Amount: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
@@ -74,15 +74,15 @@ class Money(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["amount"]) -> MetaOapg.Properties.Amount: ...
+    def get_item_(self, name: typing_extensions.Literal["amount"]) -> Schema_.Properties.Amount: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
+    def get_item_(self, name: typing_extensions.Literal["currency"]) -> 'currency.Currency': ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["amount"],
@@ -90,22 +90,22 @@ class Money(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        amount: typing.Union[MetaOapg.Properties.Amount, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        amount: typing.Union[Schema_.Properties.Amount, str, ],
         currency: 'currency.Currency',
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Money':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             amount=amount,
             currency=currency,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.py
index a1026f87ab7..3f3cf499deb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.py
@@ -35,7 +35,7 @@ class Name(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "name",
@@ -52,16 +52,16 @@ class Properties:
             }
 
     
-    name: MetaOapg.Properties.Name
+    name: Schema_.Properties.Name
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> MetaOapg.Properties.SnakeCase: ...
+    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> Schema_.Properties.SnakeCase: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["property"]) -> MetaOapg.Properties._Property: ...
+    def __getitem__(self, name: typing_extensions.Literal["property"]) -> Schema_.Properties._Property: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -79,18 +79,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[MetaOapg.Properties.SnakeCase, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[Schema_.Properties.SnakeCase, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["property"]) -> typing.Union[MetaOapg.Properties._Property, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["property"]) -> typing.Union[Schema_.Properties._Property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -99,21 +99,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        name: typing.Union[MetaOapg.Properties.Name, decimal.Decimal, int, ],
-        snake_case: typing.Union[MetaOapg.Properties.SnakeCase, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        name: typing.Union[Schema_.Properties.Name, decimal.Decimal, int, ],
+        snake_case: typing.Union[Schema_.Properties.SnakeCase, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Name':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             snake_case=snake_case,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.pyi
index a1026f87ab7..3f3cf499deb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/name.pyi
@@ -35,7 +35,7 @@ class Name(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "name",
@@ -52,16 +52,16 @@ class Name(
             }
 
     
-    name: MetaOapg.Properties.Name
+    name: Schema_.Properties.Name
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> MetaOapg.Properties.SnakeCase: ...
+    def __getitem__(self, name: typing_extensions.Literal["snake_case"]) -> Schema_.Properties.SnakeCase: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["property"]) -> MetaOapg.Properties._Property: ...
+    def __getitem__(self, name: typing_extensions.Literal["property"]) -> Schema_.Properties._Property: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -79,18 +79,18 @@ class Name(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[MetaOapg.Properties.SnakeCase, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["snake_case"]) -> typing.Union[Schema_.Properties.SnakeCase, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["property"]) -> typing.Union[MetaOapg.Properties._Property, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["property"]) -> typing.Union[Schema_.Properties._Property, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -99,21 +99,21 @@ class Name(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        name: typing.Union[MetaOapg.Properties.Name, decimal.Decimal, int, ],
-        snake_case: typing.Union[MetaOapg.Properties.SnakeCase, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        name: typing.Union[Schema_.Properties.Name, decimal.Decimal, int, ],
+        snake_case: typing.Union[Schema_.Properties.SnakeCase, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Name':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             snake_case=snake_case,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.py
index e3a82222164..fdd0f02d79e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.py
@@ -33,7 +33,7 @@ class NoAdditionalProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "id",
@@ -48,13 +48,13 @@ class Properties:
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    id: MetaOapg.Properties.Id
+    id: Schema_.Properties.Id
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.Properties.PetId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> Schema_.Properties.PetId: ...
     
     def __getitem__(
         self,
@@ -67,31 +67,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.Properties.PetId, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["petId"]) -> typing.Union[Schema_.Properties.PetId, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
             typing_extensions.Literal["petId"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, ],
-        petId: typing.Union[MetaOapg.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, ],
+        petId: typing.Union[Schema_.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             petId=petId,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.pyi
index 17f34c3cb57..a62e36e2d64 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/no_additional_properties.pyi
@@ -33,7 +33,7 @@ class NoAdditionalProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "id",
         }
@@ -47,13 +47,13 @@ class NoAdditionalProperties(
             }
         AdditionalProperties = schemas.NotAnyTypeSchema
     
-    id: MetaOapg.Properties.Id
+    id: Schema_.Properties.Id
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.Properties.PetId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> Schema_.Properties.PetId: ...
     
     def __getitem__(
         self,
@@ -66,31 +66,31 @@ class NoAdditionalProperties(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.Properties.PetId, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["petId"]) -> typing.Union[Schema_.Properties.PetId, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
             typing_extensions.Literal["petId"],
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, ],
-        petId: typing.Union[MetaOapg.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, ],
+        petId: typing.Union[Schema_.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NoAdditionalProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             petId=petId,
-            _configuration=_configuration,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.py
index 40a345c964b..4a2c81c50aa 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.py
@@ -33,7 +33,7 @@ class NullableClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -47,7 +47,7 @@ class IntegerProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         decimal.Decimal,
@@ -57,13 +57,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'IntegerProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -75,7 +75,7 @@ class NumberProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         decimal.Decimal,
@@ -84,13 +84,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, decimal.Decimal, int, float, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, decimal.Decimal, int, float, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'NumberProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -102,7 +102,7 @@ class BooleanProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         schemas.BoolClass,
@@ -111,13 +111,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, bool, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, bool, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'BooleanProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -129,7 +129,7 @@ class StringProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -138,13 +138,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'StringProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -157,7 +157,7 @@ class DateProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -167,13 +167,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, datetime.date, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, datetime.date, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'DateProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -186,7 +186,7 @@ class DatetimeProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -196,13 +196,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, datetime.datetime, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, datetime.datetime, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'DatetimeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -214,7 +214,7 @@ class ArrayNullableProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         tuple,
@@ -224,13 +224,13 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[list, tuple, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[list, tuple, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -242,7 +242,7 @@ class ArrayAndItemsNullableProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         tuple,
@@ -257,7 +257,7 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -266,27 +266,27 @@ class MetaOapg:
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[list, tuple, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[list, tuple, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayAndItemsNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -295,7 +295,7 @@ class ArrayItemsNullable(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -307,7 +307,7 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -316,29 +316,29 @@ class MetaOapg:
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, None, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, None, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, None, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, None, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayItemsNullable':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -350,7 +350,7 @@ class ObjectNullableProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -358,23 +358,23 @@ class MetaOapg:
                     AdditionalProperties = schemas.DictSchema
             
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'ObjectNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -387,7 +387,7 @@ class ObjectAndItemsNullableProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -402,7 +402,7 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -411,35 +411,35 @@ class MetaOapg:
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
                 ) -> 'ObjectAndItemsNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -449,7 +449,7 @@ class ObjectItemsNullable(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     
@@ -461,7 +461,7 @@ class AdditionalProperties(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -470,34 +470,34 @@ class MetaOapg:
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
                 ) -> 'ObjectItemsNullable':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -524,7 +524,7 @@ class AdditionalProperties(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     schemas.NoneClass,
                     frozendict.frozendict,
@@ -533,55 +533,55 @@ class MetaOapg:
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> 'AdditionalProperties':
                 return super().__new__(
                     cls,
-                    *_args,
-                    _configuration=_configuration,
+                    *args_,
+                    configuration_=configuration_,
                     **kwargs,
                 )
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> MetaOapg.Properties.IntegerProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> Schema_.Properties.IntegerProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> MetaOapg.Properties.NumberProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> Schema_.Properties.NumberProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> MetaOapg.Properties.BooleanProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> Schema_.Properties.BooleanProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> MetaOapg.Properties.StringProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> Schema_.Properties.StringProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> MetaOapg.Properties.DateProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> Schema_.Properties.DateProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> MetaOapg.Properties.DatetimeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> Schema_.Properties.DatetimeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> MetaOapg.Properties.ArrayNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> Schema_.Properties.ArrayNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> MetaOapg.Properties.ArrayAndItemsNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> Schema_.Properties.ArrayAndItemsNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> MetaOapg.Properties.ArrayItemsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> Schema_.Properties.ArrayItemsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> MetaOapg.Properties.ObjectNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> Schema_.Properties.ObjectNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> MetaOapg.Properties.ObjectAndItemsNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> Schema_.Properties.ObjectAndItemsNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> MetaOapg.Properties.ObjectItemsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> Schema_.Properties.ObjectItemsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -605,45 +605,45 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[MetaOapg.Properties.IntegerProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[Schema_.Properties.IntegerProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[MetaOapg.Properties.NumberProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[Schema_.Properties.NumberProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[MetaOapg.Properties.BooleanProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[Schema_.Properties.BooleanProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[MetaOapg.Properties.StringProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[Schema_.Properties.StringProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[MetaOapg.Properties.DateProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[Schema_.Properties.DateProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[MetaOapg.Properties.DatetimeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[Schema_.Properties.DatetimeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ArrayNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[Schema_.Properties.ArrayNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ArrayAndItemsNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[Schema_.Properties.ArrayAndItemsNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.Properties.ArrayItemsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[Schema_.Properties.ArrayItemsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ObjectNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[Schema_.Properties.ObjectNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ObjectAndItemsNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[Schema_.Properties.ObjectAndItemsNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.Properties.ObjectItemsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[Schema_.Properties.ObjectItemsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["integer_prop"],
@@ -661,29 +661,29 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        integer_prop: typing.Union[MetaOapg.Properties.IntegerProp, None, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        number_prop: typing.Union[MetaOapg.Properties.NumberProp, None, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        boolean_prop: typing.Union[MetaOapg.Properties.BooleanProp, None, bool, schemas.Unset] = schemas.unset,
-        string_prop: typing.Union[MetaOapg.Properties.StringProp, None, str, schemas.Unset] = schemas.unset,
-        date_prop: typing.Union[MetaOapg.Properties.DateProp, None, str, datetime.date, schemas.Unset] = schemas.unset,
-        datetime_prop: typing.Union[MetaOapg.Properties.DatetimeProp, None, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        array_nullable_prop: typing.Union[MetaOapg.Properties.ArrayNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
-        array_and_items_nullable_prop: typing.Union[MetaOapg.Properties.ArrayAndItemsNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
-        array_items_nullable: typing.Union[MetaOapg.Properties.ArrayItemsNullable, list, tuple, schemas.Unset] = schemas.unset,
-        object_nullable_prop: typing.Union[MetaOapg.Properties.ObjectNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        object_and_items_nullable_prop: typing.Union[MetaOapg.Properties.ObjectAndItemsNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        object_items_nullable: typing.Union[MetaOapg.Properties.ObjectItemsNullable, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        integer_prop: typing.Union[Schema_.Properties.IntegerProp, None, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        number_prop: typing.Union[Schema_.Properties.NumberProp, None, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        boolean_prop: typing.Union[Schema_.Properties.BooleanProp, None, bool, schemas.Unset] = schemas.unset,
+        string_prop: typing.Union[Schema_.Properties.StringProp, None, str, schemas.Unset] = schemas.unset,
+        date_prop: typing.Union[Schema_.Properties.DateProp, None, str, datetime.date, schemas.Unset] = schemas.unset,
+        datetime_prop: typing.Union[Schema_.Properties.DatetimeProp, None, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        array_nullable_prop: typing.Union[Schema_.Properties.ArrayNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
+        array_and_items_nullable_prop: typing.Union[Schema_.Properties.ArrayAndItemsNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
+        array_items_nullable: typing.Union[Schema_.Properties.ArrayItemsNullable, list, tuple, schemas.Unset] = schemas.unset,
+        object_nullable_prop: typing.Union[Schema_.Properties.ObjectNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        object_and_items_nullable_prop: typing.Union[Schema_.Properties.ObjectAndItemsNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        object_items_nullable: typing.Union[Schema_.Properties.ObjectItemsNullable, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
     ) -> 'NullableClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             integer_prop=integer_prop,
             number_prop=number_prop,
             boolean_prop=boolean_prop,
@@ -696,6 +696,6 @@ def __new__(
             object_nullable_prop=object_nullable_prop,
             object_and_items_nullable_prop=object_and_items_nullable_prop,
             object_items_nullable=object_items_nullable,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.pyi
index 90770aa976d..8e8b61b5216 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_class.pyi
@@ -33,7 +33,7 @@ class NullableClass(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -46,7 +46,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         decimal.Decimal,
@@ -56,13 +56,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, decimal.Decimal, int, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, decimal.Decimal, int, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'IntegerProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -74,7 +74,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         decimal.Decimal,
@@ -83,13 +83,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, decimal.Decimal, int, float, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, decimal.Decimal, int, float, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'NumberProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -101,7 +101,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         schemas.BoolClass,
@@ -110,13 +110,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, bool, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, bool, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'BooleanProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -128,7 +128,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -137,13 +137,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'StringProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -156,7 +156,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -166,13 +166,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, datetime.date, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, datetime.date, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'DateProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -185,7 +185,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         str,
@@ -195,13 +195,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[None, str, datetime.datetime, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[None, str, datetime.datetime, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'DatetimeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -213,7 +213,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         tuple,
@@ -223,13 +223,13 @@ class NullableClass(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[list, tuple, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[list, tuple, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -241,7 +241,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         tuple,
@@ -256,7 +256,7 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -265,27 +265,27 @@ class NullableClass(
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[list, tuple, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[list, tuple, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayAndItemsNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                     )
             
             
@@ -294,7 +294,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -306,7 +306,7 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -315,29 +315,29 @@ class NullableClass(
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'Items':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, None, ]], typing.List[typing.Union[MetaOapg.Items, dict, frozendict.frozendict, None, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, dict, frozendict.frozendict, None, ]], typing.List[typing.Union[Schema_.Items, dict, frozendict.frozendict, None, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'ArrayItemsNullable':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -349,7 +349,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -357,23 +357,23 @@ class NullableClass(
                     AdditionalProperties = schemas.DictSchema
             
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, ],
                 ) -> 'ObjectNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -386,7 +386,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -401,7 +401,7 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -410,35 +410,35 @@ class NullableClass(
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
             
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
                 ) -> 'ObjectAndItemsNullableProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             
@@ -448,7 +448,7 @@ class NullableClass(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     
                     class AdditionalProperties(
@@ -459,7 +459,7 @@ class NullableClass(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 schemas.NoneClass,
                                 frozendict.frozendict,
@@ -468,34 +468,34 @@ class NullableClass(
                     
                         def __new__(
                             cls,
-                            *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                            _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                            *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                            configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                             **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                         ) -> 'AdditionalProperties':
                             return super().__new__(
                                 cls,
-                                *_args,
-                                _configuration=_configuration,
+                                *args_,
+                                configuration_=configuration_,
                                 **kwargs,
                             )
                 
-                def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+                def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
                     # dict_instance[name] accessor
                     return super().__getitem__(name)
                 
-                def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-                    return super().get_item_oapg(name)
+                def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-                    **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
                 ) -> 'ObjectItemsNullable':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -522,7 +522,7 @@ class NullableClass(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     schemas.NoneClass,
                     frozendict.frozendict,
@@ -531,55 +531,55 @@ class NullableClass(
         
             def __new__(
                 cls,
-                *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
             ) -> 'AdditionalProperties':
                 return super().__new__(
                     cls,
-                    *_args,
-                    _configuration=_configuration,
+                    *args_,
+                    configuration_=configuration_,
                     **kwargs,
                 )
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> MetaOapg.Properties.IntegerProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer_prop"]) -> Schema_.Properties.IntegerProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> MetaOapg.Properties.NumberProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["number_prop"]) -> Schema_.Properties.NumberProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> MetaOapg.Properties.BooleanProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["boolean_prop"]) -> Schema_.Properties.BooleanProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> MetaOapg.Properties.StringProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["string_prop"]) -> Schema_.Properties.StringProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> MetaOapg.Properties.DateProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["date_prop"]) -> Schema_.Properties.DateProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> MetaOapg.Properties.DatetimeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["datetime_prop"]) -> Schema_.Properties.DatetimeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> MetaOapg.Properties.ArrayNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_nullable_prop"]) -> Schema_.Properties.ArrayNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> MetaOapg.Properties.ArrayAndItemsNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> Schema_.Properties.ArrayAndItemsNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> MetaOapg.Properties.ArrayItemsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["array_items_nullable"]) -> Schema_.Properties.ArrayItemsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> MetaOapg.Properties.ObjectNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_nullable_prop"]) -> Schema_.Properties.ObjectNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> MetaOapg.Properties.ObjectAndItemsNullableProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> Schema_.Properties.ObjectAndItemsNullableProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> MetaOapg.Properties.ObjectItemsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["object_items_nullable"]) -> Schema_.Properties.ObjectItemsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -603,45 +603,45 @@ class NullableClass(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[MetaOapg.Properties.IntegerProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer_prop"]) -> typing.Union[Schema_.Properties.IntegerProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[MetaOapg.Properties.NumberProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["number_prop"]) -> typing.Union[Schema_.Properties.NumberProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[MetaOapg.Properties.BooleanProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["boolean_prop"]) -> typing.Union[Schema_.Properties.BooleanProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[MetaOapg.Properties.StringProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string_prop"]) -> typing.Union[Schema_.Properties.StringProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[MetaOapg.Properties.DateProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date_prop"]) -> typing.Union[Schema_.Properties.DateProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[MetaOapg.Properties.DatetimeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["datetime_prop"]) -> typing.Union[Schema_.Properties.DatetimeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ArrayNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_nullable_prop"]) -> typing.Union[Schema_.Properties.ArrayNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ArrayAndItemsNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_and_items_nullable_prop"]) -> typing.Union[Schema_.Properties.ArrayAndItemsNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[MetaOapg.Properties.ArrayItemsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["array_items_nullable"]) -> typing.Union[Schema_.Properties.ArrayItemsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ObjectNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_nullable_prop"]) -> typing.Union[Schema_.Properties.ObjectNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[MetaOapg.Properties.ObjectAndItemsNullableProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_and_items_nullable_prop"]) -> typing.Union[Schema_.Properties.ObjectAndItemsNullableProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[MetaOapg.Properties.ObjectItemsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["object_items_nullable"]) -> typing.Union[Schema_.Properties.ObjectItemsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["integer_prop"],
@@ -659,29 +659,29 @@ class NullableClass(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        integer_prop: typing.Union[MetaOapg.Properties.IntegerProp, None, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        number_prop: typing.Union[MetaOapg.Properties.NumberProp, None, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        boolean_prop: typing.Union[MetaOapg.Properties.BooleanProp, None, bool, schemas.Unset] = schemas.unset,
-        string_prop: typing.Union[MetaOapg.Properties.StringProp, None, str, schemas.Unset] = schemas.unset,
-        date_prop: typing.Union[MetaOapg.Properties.DateProp, None, str, datetime.date, schemas.Unset] = schemas.unset,
-        datetime_prop: typing.Union[MetaOapg.Properties.DatetimeProp, None, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        array_nullable_prop: typing.Union[MetaOapg.Properties.ArrayNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
-        array_and_items_nullable_prop: typing.Union[MetaOapg.Properties.ArrayAndItemsNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
-        array_items_nullable: typing.Union[MetaOapg.Properties.ArrayItemsNullable, list, tuple, schemas.Unset] = schemas.unset,
-        object_nullable_prop: typing.Union[MetaOapg.Properties.ObjectNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        object_and_items_nullable_prop: typing.Union[MetaOapg.Properties.ObjectAndItemsNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        object_items_nullable: typing.Union[MetaOapg.Properties.ObjectItemsNullable, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, None, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        integer_prop: typing.Union[Schema_.Properties.IntegerProp, None, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        number_prop: typing.Union[Schema_.Properties.NumberProp, None, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        boolean_prop: typing.Union[Schema_.Properties.BooleanProp, None, bool, schemas.Unset] = schemas.unset,
+        string_prop: typing.Union[Schema_.Properties.StringProp, None, str, schemas.Unset] = schemas.unset,
+        date_prop: typing.Union[Schema_.Properties.DateProp, None, str, datetime.date, schemas.Unset] = schemas.unset,
+        datetime_prop: typing.Union[Schema_.Properties.DatetimeProp, None, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        array_nullable_prop: typing.Union[Schema_.Properties.ArrayNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
+        array_and_items_nullable_prop: typing.Union[Schema_.Properties.ArrayAndItemsNullableProp, list, tuple, None, schemas.Unset] = schemas.unset,
+        array_items_nullable: typing.Union[Schema_.Properties.ArrayItemsNullable, list, tuple, schemas.Unset] = schemas.unset,
+        object_nullable_prop: typing.Union[Schema_.Properties.ObjectNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        object_and_items_nullable_prop: typing.Union[Schema_.Properties.ObjectAndItemsNullableProp, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        object_items_nullable: typing.Union[Schema_.Properties.ObjectItemsNullable, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, None, ],
     ) -> 'NullableClass':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             integer_prop=integer_prop,
             number_prop=number_prop,
             boolean_prop=boolean_prop,
@@ -694,6 +694,6 @@ class NullableClass(
             object_nullable_prop=object_nullable_prop,
             object_and_items_nullable_prop=object_and_items_nullable_prop,
             object_items_nullable=object_items_nullable,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.py
index 00b66370d97..06a21efc71f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.py
@@ -35,7 +35,7 @@ class NullableShape(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -57,14 +57,14 @@ def one_of1() -> typing.Type['quadrilateral.Quadrilateral']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.pyi
index 00b66370d97..06a21efc71f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_shape.pyi
@@ -35,7 +35,7 @@ class NullableShape(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class OneOf:
@@ -57,14 +57,14 @@ class NullableShape(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NullableShape':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.py
index 310a7b67cd8..8a02ca0dc4e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.py
@@ -36,7 +36,7 @@ class NullableString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             str,
@@ -45,11 +45,11 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[None, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NullableString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.pyi
index 310a7b67cd8..8a02ca0dc4e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/nullable_string.pyi
@@ -36,7 +36,7 @@ class NullableString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             str,
@@ -45,11 +45,11 @@ class NullableString(
 
     def __new__(
         cls,
-        *_args: typing.Union[None, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'NullableString':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.py
index 9f7883b2def..de69c9ae945 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.py
@@ -33,7 +33,7 @@ class NumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -43,7 +43,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> MetaOapg.Properties.JustNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> Schema_.Properties.JustNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -59,31 +59,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[MetaOapg.Properties.JustNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[Schema_.Properties.JustNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["JustNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        JustNumber: typing.Union[MetaOapg.Properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        JustNumber: typing.Union[Schema_.Properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             JustNumber=JustNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.pyi
index b5d43f88b57..3ffcb4c277a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_only.pyi
@@ -33,7 +33,7 @@ class NumberOnly(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             JustNumber = schemas.NumberSchema
@@ -42,7 +42,7 @@ class NumberOnly(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> MetaOapg.Properties.JustNumber: ...
+    def __getitem__(self, name: typing_extensions.Literal["JustNumber"]) -> Schema_.Properties.JustNumber: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -58,31 +58,31 @@ class NumberOnly(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[MetaOapg.Properties.JustNumber, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["JustNumber"]) -> typing.Union[Schema_.Properties.JustNumber, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["JustNumber"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        JustNumber: typing.Union[MetaOapg.Properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        JustNumber: typing.Union[Schema_.Properties.JustNumber, decimal.Decimal, int, float, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'NumberOnly':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             JustNumber=JustNumber,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_with_validations.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_with_validations.py
index 14d3f6dfbb6..893890e6661 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_with_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/number_with_validations.py
@@ -33,7 +33,7 @@ class NumberWithValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.py
index b81b1fc7d5a..f3434bfd1a2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.py
@@ -33,7 +33,7 @@ class ObjectModelWithArgAndArgsProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "arg",
@@ -48,14 +48,14 @@ class Properties:
                 "args": Args,
             }
     
-    arg: MetaOapg.Properties.Arg
-    args: MetaOapg.Properties.Args
+    arg: Schema_.Properties.Arg
+    args: Schema_.Properties.Args
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["arg"]) -> MetaOapg.Properties.Arg: ...
+    def __getitem__(self, name: typing_extensions.Literal["arg"]) -> Schema_.Properties.Arg: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["args"]) -> MetaOapg.Properties.Args: ...
+    def __getitem__(self, name: typing_extensions.Literal["args"]) -> Schema_.Properties.Args: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -72,15 +72,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["arg"]) -> MetaOapg.Properties.Arg: ...
+    def get_item_(self, name: typing_extensions.Literal["arg"]) -> Schema_.Properties.Arg: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["args"]) -> MetaOapg.Properties.Args: ...
+    def get_item_(self, name: typing_extensions.Literal["args"]) -> Schema_.Properties.Args: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["arg"],
@@ -88,21 +88,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        arg: typing.Union[MetaOapg.Properties.Arg, str, ],
-        args: typing.Union[MetaOapg.Properties.Args, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        arg: typing.Union[Schema_.Properties.Arg, str, ],
+        args: typing.Union[Schema_.Properties.Args, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectModelWithArgAndArgsProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             arg=arg,
             args=args,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.pyi
index 1edb57b6fd1..ad05b3d9778 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_arg_and_args_properties.pyi
@@ -33,7 +33,7 @@ class ObjectModelWithArgAndArgsProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "arg",
             "args",
@@ -47,14 +47,14 @@ class ObjectModelWithArgAndArgsProperties(
                 "args": Args,
             }
     
-    arg: MetaOapg.Properties.Arg
-    args: MetaOapg.Properties.Args
+    arg: Schema_.Properties.Arg
+    args: Schema_.Properties.Args
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["arg"]) -> MetaOapg.Properties.Arg: ...
+    def __getitem__(self, name: typing_extensions.Literal["arg"]) -> Schema_.Properties.Arg: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["args"]) -> MetaOapg.Properties.Args: ...
+    def __getitem__(self, name: typing_extensions.Literal["args"]) -> Schema_.Properties.Args: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -71,15 +71,15 @@ class ObjectModelWithArgAndArgsProperties(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["arg"]) -> MetaOapg.Properties.Arg: ...
+    def get_item_(self, name: typing_extensions.Literal["arg"]) -> Schema_.Properties.Arg: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["args"]) -> MetaOapg.Properties.Args: ...
+    def get_item_(self, name: typing_extensions.Literal["args"]) -> Schema_.Properties.Args: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["arg"],
@@ -87,21 +87,21 @@ class ObjectModelWithArgAndArgsProperties(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        arg: typing.Union[MetaOapg.Properties.Arg, str, ],
-        args: typing.Union[MetaOapg.Properties.Args, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        arg: typing.Union[Schema_.Properties.Arg, str, ],
+        args: typing.Union[Schema_.Properties.Args, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectModelWithArgAndArgsProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             arg=arg,
             args=args,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.py
index 4eef533bbd8..d089b7d24bf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.py
@@ -35,7 +35,7 @@ class ObjectModelWithRefProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -82,18 +82,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['number_with_validations.NumberWithValidations', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['number_with_validations.NumberWithValidations', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myString"]) -> typing.Union['string.String', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myString"]) -> typing.Union['string.String', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union['boolean.Boolean', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union['boolean.Boolean', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["myNumber"],
@@ -102,24 +102,24 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         myNumber: typing.Union['number_with_validations.NumberWithValidations', schemas.Unset] = schemas.unset,
         myString: typing.Union['string.String', schemas.Unset] = schemas.unset,
         myBoolean: typing.Union['boolean.Boolean', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             myNumber=myNumber,
             myString=myString,
             myBoolean=myBoolean,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.pyi
index a0d974f95cb..4444ff15fb5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_model_with_ref_props.pyi
@@ -35,7 +35,7 @@ class ObjectModelWithRefProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -81,18 +81,18 @@ class ObjectModelWithRefProps(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['number_with_validations.NumberWithValidations', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myNumber"]) -> typing.Union['number_with_validations.NumberWithValidations', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myString"]) -> typing.Union['string.String', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myString"]) -> typing.Union['string.String', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union['boolean.Boolean', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["myBoolean"]) -> typing.Union['boolean.Boolean', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["myNumber"],
@@ -101,24 +101,24 @@ class ObjectModelWithRefProps(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         myNumber: typing.Union['number_with_validations.NumberWithValidations', schemas.Unset] = schemas.unset,
         myString: typing.Union['string.String', schemas.Unset] = schemas.unset,
         myBoolean: typing.Union['boolean.Boolean', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectModelWithRefProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             myNumber=myNumber,
             myString=myString,
             myBoolean=myBoolean,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.py
index 8843911195a..285ecc0f79a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.py
@@ -33,7 +33,7 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     required = {
                         "test",
@@ -66,7 +66,7 @@ class Properties:
                 def __getitem__(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+                def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -83,15 +83,15 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["test"],
@@ -99,22 +99,22 @@ def get_item_oapg(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
                     test: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         test=test,
                         name=name,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -125,14 +125,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithAllOfWithReqTestPropFromUnsetAddProp':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.pyi
index 2e05893c9cf..c225b6c3230 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_all_of_with_req_test_prop_from_unset_add_prop.pyi
@@ -33,7 +33,7 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     required = {
                         "test",
                     }
@@ -65,7 +65,7 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
                 def __getitem__(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+                def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -82,15 +82,15 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
+                def get_item_(self, name: typing_extensions.Literal["test"]) -> schemas.AnyTypeSchema: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["test"],
@@ -98,22 +98,22 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
                     test: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         test=test,
                         name=name,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -124,14 +124,14 @@ class ObjectWithAllOfWithReqTestPropFromUnsetAddProp(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithAllOfWithReqTestPropFromUnsetAddProp':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.py
index 42748dae5ab..c5656e10c26 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.py
@@ -33,7 +33,7 @@ class ObjectWithDecimalProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -56,7 +56,7 @@ def cost() -> typing.Type['money.Money']:
     def __getitem__(self, name: typing_extensions.Literal["length"]) -> 'decimal_payload.DecimalPayload': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["width"]) -> MetaOapg.Properties.Width: ...
+    def __getitem__(self, name: typing_extensions.Literal["width"]) -> Schema_.Properties.Width: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["cost"]) -> 'money.Money': ...
@@ -77,18 +77,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["length"]) -> typing.Union['decimal_payload.DecimalPayload', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["length"]) -> typing.Union['decimal_payload.DecimalPayload', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["width"]) -> typing.Union[MetaOapg.Properties.Width, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["width"]) -> typing.Union[Schema_.Properties.Width, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cost"]) -> typing.Union['money.Money', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["cost"]) -> typing.Union['money.Money', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["length"],
@@ -97,24 +97,24 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         length: typing.Union['decimal_payload.DecimalPayload', schemas.Unset] = schemas.unset,
-        width: typing.Union[MetaOapg.Properties.Width, str, schemas.Unset] = schemas.unset,
+        width: typing.Union[Schema_.Properties.Width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['money.Money', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             length=length,
             width=width,
             cost=cost,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.pyi
index 8a5c2e7d76f..6b374c8db89 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_decimal_properties.pyi
@@ -33,7 +33,7 @@ class ObjectWithDecimalProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -55,7 +55,7 @@ class ObjectWithDecimalProperties(
     def __getitem__(self, name: typing_extensions.Literal["length"]) -> 'decimal_payload.DecimalPayload': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["width"]) -> MetaOapg.Properties.Width: ...
+    def __getitem__(self, name: typing_extensions.Literal["width"]) -> Schema_.Properties.Width: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["cost"]) -> 'money.Money': ...
@@ -76,18 +76,18 @@ class ObjectWithDecimalProperties(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["length"]) -> typing.Union['decimal_payload.DecimalPayload', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["length"]) -> typing.Union['decimal_payload.DecimalPayload', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["width"]) -> typing.Union[MetaOapg.Properties.Width, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["width"]) -> typing.Union[Schema_.Properties.Width, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["cost"]) -> typing.Union['money.Money', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["cost"]) -> typing.Union['money.Money', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["length"],
@@ -96,24 +96,24 @@ class ObjectWithDecimalProperties(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         length: typing.Union['decimal_payload.DecimalPayload', schemas.Unset] = schemas.unset,
-        width: typing.Union[MetaOapg.Properties.Width, str, schemas.Unset] = schemas.unset,
+        width: typing.Union[Schema_.Properties.Width, str, schemas.Unset] = schemas.unset,
         cost: typing.Union['money.Money', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithDecimalProperties':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             length=length,
             width=width,
             cost=cost,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.py
index f5bcc57e7cb..c237e04cc34 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.py
@@ -35,7 +35,7 @@ class ObjectWithDifficultlyNamedProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "123-list",
@@ -53,13 +53,13 @@ class Properties:
     
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.Properties._123List: ...
+    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> Schema_.Properties._123List: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> MetaOapg.Properties.SpecialPropertyName: ...
+    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> Schema_.Properties.SpecialPropertyName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> MetaOapg.Properties._123Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> Schema_.Properties._123Number: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -77,18 +77,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.Properties._123List: ...
+    def get_item_(self, name: typing_extensions.Literal["123-list"]) -> Schema_.Properties._123List: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.Properties.SpecialPropertyName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[Schema_.Properties.SpecialPropertyName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[MetaOapg.Properties._123Number, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[Schema_.Properties._123Number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["123-list"],
@@ -97,17 +97,17 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.pyi
index f2f280bb651..6b463440c16 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_difficultly_named_props.pyi
@@ -35,7 +35,7 @@ class ObjectWithDifficultlyNamedProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "123-list",
         }
@@ -52,13 +52,13 @@ class ObjectWithDifficultlyNamedProps(
     
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.Properties._123List: ...
+    def __getitem__(self, name: typing_extensions.Literal["123-list"]) -> Schema_.Properties._123List: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> MetaOapg.Properties.SpecialPropertyName: ...
+    def __getitem__(self, name: typing_extensions.Literal["$special[property.name]"]) -> Schema_.Properties.SpecialPropertyName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> MetaOapg.Properties._123Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["123Number"]) -> Schema_.Properties._123Number: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,18 +76,18 @@ class ObjectWithDifficultlyNamedProps(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["123-list"]) -> MetaOapg.Properties._123List: ...
+    def get_item_(self, name: typing_extensions.Literal["123-list"]) -> Schema_.Properties._123List: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[MetaOapg.Properties.SpecialPropertyName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["$special[property.name]"]) -> typing.Union[Schema_.Properties.SpecialPropertyName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[MetaOapg.Properties._123Number, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["123Number"]) -> typing.Union[Schema_.Properties._123Number, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["123-list"],
@@ -96,17 +96,17 @@ class ObjectWithDifficultlyNamedProps(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithDifficultlyNamedProps':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.py
index c28c7af48c8..34c2d441144 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.py
@@ -33,7 +33,7 @@ class ObjectWithInlineCompositionProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -44,7 +44,7 @@ class SomeProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -55,7 +55,7 @@ class AllOf0(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -67,14 +67,14 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -82,7 +82,7 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -98,31 +98,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.pyi
index 14063c12db2..9fa803c34b1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_inline_composition_property.pyi
@@ -33,7 +33,7 @@ class ObjectWithInlineCompositionProperty(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -43,7 +43,7 @@ class ObjectWithInlineCompositionProperty(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -60,14 +60,14 @@ class ObjectWithInlineCompositionProperty(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -75,7 +75,7 @@ class ObjectWithInlineCompositionProperty(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,31 +91,31 @@ class ObjectWithInlineCompositionProperty(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithInlineCompositionProperty':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.py
index 18b8a53b31e..2492549e495 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.py
@@ -33,7 +33,7 @@ class ObjectWithInvalidNamedRefedProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "!reference",
@@ -76,15 +76,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["!reference"]) -> 'array_with_validations_in_items.ArrayWithValidationsInItems': ...
+    def get_item_(self, name: typing_extensions.Literal["!reference"]) -> 'array_with_validations_in_items.ArrayWithValidationsInItems': ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> 'from_schema.FromSchema': ...
+    def get_item_(self, name: typing_extensions.Literal["from"]) -> 'from_schema.FromSchema': ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["!reference"],
@@ -92,18 +92,18 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithInvalidNamedRefedProperties':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.pyi
index 26a5c35cc34..1504b9019a9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_invalid_named_refed_properties.pyi
@@ -33,7 +33,7 @@ class ObjectWithInvalidNamedRefedProperties(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "!reference",
             "from",
@@ -75,15 +75,15 @@ class ObjectWithInvalidNamedRefedProperties(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["!reference"]) -> 'array_with_validations_in_items.ArrayWithValidationsInItems': ...
+    def get_item_(self, name: typing_extensions.Literal["!reference"]) -> 'array_with_validations_in_items.ArrayWithValidationsInItems': ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["from"]) -> 'from_schema.FromSchema': ...
+    def get_item_(self, name: typing_extensions.Literal["from"]) -> 'from_schema.FromSchema': ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["!reference"],
@@ -91,18 +91,18 @@ class ObjectWithInvalidNamedRefedProperties(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithInvalidNamedRefedProperties':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.py
index 8297af42474..fee377cbd46 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.py
@@ -33,7 +33,7 @@ class ObjectWithOptionalTestProp(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -43,7 +43,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["test"]) -> MetaOapg.Properties.Test: ...
+    def __getitem__(self, name: typing_extensions.Literal["test"]) -> Schema_.Properties.Test: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -59,31 +59,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["test"]) -> typing.Union[MetaOapg.Properties.Test, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["test"]) -> typing.Union[Schema_.Properties.Test, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["test"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        test: typing.Union[MetaOapg.Properties.Test, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        test: typing.Union[Schema_.Properties.Test, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithOptionalTestProp':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             test=test,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.pyi
index 7d942388ccc..3ac7a5651d3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_optional_test_prop.pyi
@@ -33,7 +33,7 @@ class ObjectWithOptionalTestProp(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Test = schemas.StrSchema
@@ -42,7 +42,7 @@ class ObjectWithOptionalTestProp(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["test"]) -> MetaOapg.Properties.Test: ...
+    def __getitem__(self, name: typing_extensions.Literal["test"]) -> Schema_.Properties.Test: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -58,31 +58,31 @@ class ObjectWithOptionalTestProp(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["test"]) -> typing.Union[MetaOapg.Properties.Test, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["test"]) -> typing.Union[Schema_.Properties.Test, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["test"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        test: typing.Union[MetaOapg.Properties.Test, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        test: typing.Union[Schema_.Properties.Test, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithOptionalTestProp':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             test=test,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.py
index 2ba22f1b3a0..14bb579ac36 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.py
@@ -33,19 +33,19 @@ class ObjectWithValidations(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         min_properties = 2
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.pyi
index 29e8accd9c9..f0ed4869efd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/object_with_validations.pyi
@@ -34,13 +34,13 @@ class ObjectWithValidations(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ObjectWithValidations':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.py
index d37a35f4e84..e2b122d6692 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.py
@@ -33,7 +33,7 @@ class Order(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -48,7 +48,7 @@ class Status(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -80,22 +80,22 @@ def DELIVERED(cls):
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.Properties.PetId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> Schema_.Properties.PetId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> MetaOapg.Properties.Quantity: ...
+    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> Schema_.Properties.Quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> MetaOapg.Properties.ShipDate: ...
+    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> Schema_.Properties.ShipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> MetaOapg.Properties.Complete: ...
+    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> Schema_.Properties.Complete: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -116,27 +116,27 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.Properties.PetId, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["petId"]) -> typing.Union[Schema_.Properties.PetId, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[MetaOapg.Properties.Quantity, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[Schema_.Properties.Quantity, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[MetaOapg.Properties.ShipDate, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[Schema_.Properties.ShipDate, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["complete"]) -> typing.Union[MetaOapg.Properties.Complete, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["complete"]) -> typing.Union[Schema_.Properties.Complete, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -148,29 +148,29 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        petId: typing.Union[MetaOapg.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        quantity: typing.Union[MetaOapg.Properties.Quantity, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        shipDate: typing.Union[MetaOapg.Properties.ShipDate, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        complete: typing.Union[MetaOapg.Properties.Complete, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        petId: typing.Union[Schema_.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        quantity: typing.Union[Schema_.Properties.Quantity, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        shipDate: typing.Union[Schema_.Properties.ShipDate, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        complete: typing.Union[Schema_.Properties.Complete, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Order':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             petId=petId,
             quantity=quantity,
             shipDate=shipDate,
             status=status,
             complete=complete,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.pyi
index 7f29fa31874..56467401903 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/order.pyi
@@ -33,7 +33,7 @@ class Order(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Id = schemas.Int64Schema
@@ -68,22 +68,22 @@ class Order(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> MetaOapg.Properties.PetId: ...
+    def __getitem__(self, name: typing_extensions.Literal["petId"]) -> Schema_.Properties.PetId: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> MetaOapg.Properties.Quantity: ...
+    def __getitem__(self, name: typing_extensions.Literal["quantity"]) -> Schema_.Properties.Quantity: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> MetaOapg.Properties.ShipDate: ...
+    def __getitem__(self, name: typing_extensions.Literal["shipDate"]) -> Schema_.Properties.ShipDate: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> MetaOapg.Properties.Complete: ...
+    def __getitem__(self, name: typing_extensions.Literal["complete"]) -> Schema_.Properties.Complete: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -104,27 +104,27 @@ class Order(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["petId"]) -> typing.Union[MetaOapg.Properties.PetId, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["petId"]) -> typing.Union[Schema_.Properties.PetId, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[MetaOapg.Properties.Quantity, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["quantity"]) -> typing.Union[Schema_.Properties.Quantity, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[MetaOapg.Properties.ShipDate, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["shipDate"]) -> typing.Union[Schema_.Properties.ShipDate, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["complete"]) -> typing.Union[MetaOapg.Properties.Complete, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["complete"]) -> typing.Union[Schema_.Properties.Complete, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -136,29 +136,29 @@ class Order(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        petId: typing.Union[MetaOapg.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        quantity: typing.Union[MetaOapg.Properties.Quantity, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        shipDate: typing.Union[MetaOapg.Properties.ShipDate, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        complete: typing.Union[MetaOapg.Properties.Complete, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        petId: typing.Union[Schema_.Properties.PetId, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        quantity: typing.Union[Schema_.Properties.Quantity, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        shipDate: typing.Union[Schema_.Properties.ShipDate, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        complete: typing.Union[Schema_.Properties.Complete, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Order':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             petId=petId,
             quantity=quantity,
             shipDate=shipDate,
             status=status,
             complete=complete,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.py
index 1a2b1101b2f..7bea92330d3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.py
@@ -33,7 +33,7 @@ class ParentPet(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -58,14 +58,14 @@ def all_of0() -> typing.Type['grandparent_animal.GrandparentAnimal']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.pyi
index 1a2b1101b2f..7bea92330d3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/parent_pet.pyi
@@ -33,7 +33,7 @@ class ParentPet(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             frozendict.frozendict,
         }
@@ -58,14 +58,14 @@ class ParentPet(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ParentPet':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.py
index e1ebf35ac69..e2b1ffbce4b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.py
@@ -35,7 +35,7 @@ class Pet(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "name",
@@ -56,22 +56,22 @@ class PhotoUrls(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.StrSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'PhotoUrls':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -80,7 +80,7 @@ class Tags(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -89,13 +89,13 @@ def items() -> typing.Type['tag.Tag']:
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['tag.Tag'], typing.List['tag.Tag']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['tag.Tag'], typing.List['tag.Tag']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Tags':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'tag.Tag':
@@ -107,7 +107,7 @@ class Status(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -137,26 +137,26 @@ def SOLD(cls):
                 "status": Status,
             }
     
-    name: MetaOapg.Properties.Name
-    photoUrls: MetaOapg.Properties.PhotoUrls
+    name: Schema_.Properties.Name
+    photoUrls: Schema_.Properties.PhotoUrls
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.Properties.PhotoUrls: ...
+    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> Schema_.Properties.PhotoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["category"]) -> 'category.Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> MetaOapg.Properties.Tags: ...
+    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> Schema_.Properties.Tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -177,27 +177,27 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.Properties.PhotoUrls: ...
+    def get_item_(self, name: typing_extensions.Literal["photoUrls"]) -> Schema_.Properties.PhotoUrls: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["category"]) -> typing.Union['category.Category', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["category"]) -> typing.Union['category.Category', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["tags"]) -> typing.Union[MetaOapg.Properties.Tags, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["tags"]) -> typing.Union[Schema_.Properties.Tags, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -209,30 +209,30 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, ],
-        photoUrls: typing.Union[MetaOapg.Properties.PhotoUrls, list, tuple, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, ],
+        photoUrls: typing.Union[Schema_.Properties.PhotoUrls, list, tuple, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
         category: typing.Union['category.Category', schemas.Unset] = schemas.unset,
-        tags: typing.Union[MetaOapg.Properties.Tags, list, tuple, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        tags: typing.Union[Schema_.Properties.Tags, list, tuple, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Pet':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             photoUrls=photoUrls,
             id=id,
             category=category,
             tags=tags,
             status=status,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.pyi
index 1b7a94ed05d..c54bfb35886 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pet.pyi
@@ -35,7 +35,7 @@ class Pet(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "name",
             "photoUrls",
@@ -55,22 +55,22 @@ class Pet(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.StrSchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'PhotoUrls':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -79,7 +79,7 @@ class Pet(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     @staticmethod
@@ -88,13 +88,13 @@ class Pet(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple['tag.Tag'], typing.List['tag.Tag']],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple['tag.Tag'], typing.List['tag.Tag']],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Tags':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
                 def __getitem__(self, i: int) -> 'tag.Tag':
@@ -125,26 +125,26 @@ class Pet(
                 "status": Status,
             }
     
-    name: MetaOapg.Properties.Name
-    photoUrls: MetaOapg.Properties.PhotoUrls
+    name: Schema_.Properties.Name
+    photoUrls: Schema_.Properties.PhotoUrls
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.Properties.PhotoUrls: ...
+    def __getitem__(self, name: typing_extensions.Literal["photoUrls"]) -> Schema_.Properties.PhotoUrls: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["category"]) -> 'category.Category': ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> MetaOapg.Properties.Tags: ...
+    def __getitem__(self, name: typing_extensions.Literal["tags"]) -> Schema_.Properties.Tags: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -165,27 +165,27 @@ class Pet(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["photoUrls"]) -> MetaOapg.Properties.PhotoUrls: ...
+    def get_item_(self, name: typing_extensions.Literal["photoUrls"]) -> Schema_.Properties.PhotoUrls: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["category"]) -> typing.Union['category.Category', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["category"]) -> typing.Union['category.Category', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["tags"]) -> typing.Union[MetaOapg.Properties.Tags, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["tags"]) -> typing.Union[Schema_.Properties.Tags, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -197,30 +197,30 @@ class Pet(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, ],
-        photoUrls: typing.Union[MetaOapg.Properties.PhotoUrls, list, tuple, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, ],
+        photoUrls: typing.Union[Schema_.Properties.PhotoUrls, list, tuple, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
         category: typing.Union['category.Category', schemas.Unset] = schemas.unset,
-        tags: typing.Union[MetaOapg.Properties.Tags, list, tuple, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        tags: typing.Union[Schema_.Properties.Tags, list, tuple, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Pet':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             photoUrls=photoUrls,
             id=id,
             category=category,
             tags=tags,
             status=status,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.py
index d16157e29e5..c890827f5e1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.py
@@ -33,7 +33,7 @@ class Pig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ def one_of1() -> typing.Type['danish_pig.DanishPig']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Pig':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.pyi
index d16157e29e5..c890827f5e1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/pig.pyi
@@ -33,7 +33,7 @@ class Pig(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ class Pig(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Pig':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.py
index a6aff5414c1..7c1a5a7f8a9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.py
@@ -35,7 +35,7 @@ class Player(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -50,7 +50,7 @@ def enemy_player() -> typing.Type['Player']:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["enemyPlayer"]) -> 'Player': ...
@@ -70,15 +70,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -86,21 +86,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Player':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             enemyPlayer=enemyPlayer,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.pyi
index c0de2c01445..f16fb5f1f76 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/player.pyi
@@ -35,7 +35,7 @@ class Player(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Name = schemas.StrSchema
@@ -49,7 +49,7 @@ class Player(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
     def __getitem__(self, name: typing_extensions.Literal["enemyPlayer"]) -> 'Player': ...
@@ -69,15 +69,15 @@ class Player(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enemyPlayer"]) -> typing.Union['Player', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -85,21 +85,21 @@ class Player(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
         enemyPlayer: typing.Union['Player', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Player':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             enemyPlayer=enemyPlayer,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.py
index 9ebe7e07ca4..dd2fae76dac 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.py
@@ -33,7 +33,7 @@ class Quadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ def one_of1() -> typing.Type['complex_quadrilateral.ComplexQuadrilateral']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.pyi
index 9ebe7e07ca4..dd2fae76dac 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral.pyi
@@ -33,7 +33,7 @@ class Quadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ class Quadrilateral(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Quadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.py
index e9b6244b7b2..471f212142b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.py
@@ -33,7 +33,7 @@ class QuadrilateralInterface(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "quadrilateralType",
@@ -48,7 +48,7 @@ class ShapeType(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -66,14 +66,14 @@ def QUADRILATERAL(cls):
             }
 
     
-    quadrilateralType: MetaOapg.Properties.QuadrilateralType
-    shapeType: MetaOapg.Properties.ShapeType
+    quadrilateralType: Schema_.Properties.QuadrilateralType
+    shapeType: Schema_.Properties.ShapeType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -90,15 +90,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+    def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["quadrilateralType"],
@@ -106,21 +106,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, ],
-        shapeType: typing.Union[MetaOapg.Properties.ShapeType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, ],
+        shapeType: typing.Union[Schema_.Properties.ShapeType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             quadrilateralType=quadrilateralType,
             shapeType=shapeType,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.pyi
index b039f0e452a..87d089502e3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/quadrilateral_interface.pyi
@@ -33,7 +33,7 @@ class QuadrilateralInterface(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "quadrilateralType",
@@ -57,14 +57,14 @@ class QuadrilateralInterface(
             }
 
     
-    quadrilateralType: MetaOapg.Properties.QuadrilateralType
-    shapeType: MetaOapg.Properties.ShapeType
+    quadrilateralType: Schema_.Properties.QuadrilateralType
+    shapeType: Schema_.Properties.ShapeType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+    def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,15 +81,15 @@ class QuadrilateralInterface(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+    def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["quadrilateralType"],
@@ -97,21 +97,21 @@ class QuadrilateralInterface(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, ],
-        shapeType: typing.Union[MetaOapg.Properties.ShapeType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, ],
+        shapeType: typing.Union[Schema_.Properties.ShapeType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'QuadrilateralInterface':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             quadrilateralType=quadrilateralType,
             shapeType=shapeType,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.py
index 3744b6ed0b2..d5a32a69237 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.py
@@ -33,7 +33,7 @@ class ReadOnlyFirst(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,10 +45,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> typing.Union[MetaOapg.Properties.Baz, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["baz"]) -> typing.Union[Schema_.Properties.Baz, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        baz: typing.Union[MetaOapg.Properties.Baz, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        baz: typing.Union[Schema_.Properties.Baz, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             baz=baz,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.pyi
index 3cdf0a82619..192196127b0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/read_only_first.pyi
@@ -33,7 +33,7 @@ class ReadOnlyFirst(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Bar = schemas.StrSchema
@@ -44,10 +44,10 @@ class ReadOnlyFirst(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> MetaOapg.Properties.Bar: ...
+    def __getitem__(self, name: typing_extensions.Literal["bar"]) -> Schema_.Properties.Bar: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> MetaOapg.Properties.Baz: ...
+    def __getitem__(self, name: typing_extensions.Literal["baz"]) -> Schema_.Properties.Baz: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class ReadOnlyFirst(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["bar"]) -> typing.Union[MetaOapg.Properties.Bar, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["bar"]) -> typing.Union[Schema_.Properties.Bar, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["baz"]) -> typing.Union[MetaOapg.Properties.Baz, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["baz"]) -> typing.Union[Schema_.Properties.Baz, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["bar"],
@@ -80,21 +80,21 @@ class ReadOnlyFirst(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        bar: typing.Union[MetaOapg.Properties.Bar, str, schemas.Unset] = schemas.unset,
-        baz: typing.Union[MetaOapg.Properties.Baz, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        bar: typing.Union[Schema_.Properties.Bar, str, schemas.Unset] = schemas.unset,
+        baz: typing.Union[Schema_.Properties.Baz, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ReadOnlyFirst':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             bar=bar,
             baz=baz,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.py
index 8e93deaa146..7bbd9eabc9e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.py
@@ -33,7 +33,7 @@ class ReqPropsFromExplicitAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "invalid-name",
@@ -41,16 +41,16 @@ class MetaOapg:
         }
         AdditionalProperties = schemas.StrSchema
     
-    validName: MetaOapg.AdditionalProperties
+    validName: Schema_.AdditionalProperties
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -64,15 +64,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -80,19 +80,19 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        validName: typing.Union[MetaOapg.AdditionalProperties, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        validName: typing.Union[Schema_.AdditionalProperties, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
     ) -> 'ReqPropsFromExplicitAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.pyi
index 04295d6d65e..651b89f832e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_explicit_add_props.pyi
@@ -33,23 +33,23 @@ class ReqPropsFromExplicitAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "invalid-name",
             "validName",
         }
         AdditionalProperties = schemas.StrSchema
     
-    validName: MetaOapg.AdditionalProperties
+    validName: Schema_.AdditionalProperties
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -63,15 +63,15 @@ class ReqPropsFromExplicitAddProps(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -79,19 +79,19 @@ class ReqPropsFromExplicitAddProps(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        validName: typing.Union[MetaOapg.AdditionalProperties, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        validName: typing.Union[Schema_.AdditionalProperties, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
     ) -> 'ReqPropsFromExplicitAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.py
index bb817157acf..6801c0e5758 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.py
@@ -33,7 +33,7 @@ class ReqPropsFromTrueAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "invalid-name",
@@ -41,16 +41,16 @@ class MetaOapg:
         }
         AdditionalProperties = schemas.AnyTypeSchema
     
-    validName: MetaOapg.AdditionalProperties
+    validName: Schema_.AdditionalProperties
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -64,15 +64,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -80,19 +80,19 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        validName: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        validName: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     ) -> 'ReqPropsFromTrueAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.pyi
index 200b69a9e0b..8a7d54e41a5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_true_add_props.pyi
@@ -33,23 +33,23 @@ class ReqPropsFromTrueAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "invalid-name",
             "validName",
         }
         AdditionalProperties = schemas.AnyTypeSchema
     
-    validName: MetaOapg.AdditionalProperties
+    validName: Schema_.AdditionalProperties
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -63,15 +63,15 @@ class ReqPropsFromTrueAddProps(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> MetaOapg.AdditionalProperties: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> Schema_.AdditionalProperties: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -79,19 +79,19 @@ class ReqPropsFromTrueAddProps(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        validName: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        validName: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     ) -> 'ReqPropsFromTrueAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.py
index e99cf5bebd1..d31ffd30f7d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.py
@@ -33,7 +33,7 @@ class ReqPropsFromUnsetAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "invalid-name",
@@ -63,15 +63,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -79,19 +79,19 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         validName: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ReqPropsFromUnsetAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.pyi
index c87f3b36fd6..c0ad0bf5817 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/req_props_from_unset_add_props.pyi
@@ -33,7 +33,7 @@ class ReqPropsFromUnsetAddProps(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "invalid-name",
             "validName",
@@ -62,15 +62,15 @@ class ReqPropsFromUnsetAddProps(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["invalid-name"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["invalid-name"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["validName"]) -> schemas.AnyTypeSchema: ...
+    def get_item_(self, name: typing_extensions.Literal["validName"]) -> schemas.AnyTypeSchema: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["invalid-name"],
@@ -78,19 +78,19 @@ class ReqPropsFromUnsetAddProps(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         validName: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ReqPropsFromUnsetAddProps':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             validName=validName,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.py
index 36402ad82b7..f5c0be6083d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.py
@@ -33,7 +33,7 @@ class ScaleneTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -59,7 +59,7 @@ class TriangleType(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -75,7 +75,7 @@ def SCALENE_TRIANGLE(cls):
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,32 +91,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -127,14 +127,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.pyi
index e9ddcbba2f0..727f4bf8ec9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/scalene_triangle.pyi
@@ -33,7 +33,7 @@ class ScaleneTriangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class ScaleneTriangle(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         
@@ -65,7 +65,7 @@ class ScaleneTriangle(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+                def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,32 +81,32 @@ class ScaleneTriangle(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[MetaOapg.Properties.TriangleType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> typing.Union[Schema_.Properties.TriangleType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["triangleType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    triangleType: typing.Union[Schema_.Properties.TriangleType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         triangleType=triangleType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -117,14 +117,14 @@ class ScaleneTriangle(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ScaleneTriangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.py
index 2c46c2d3224..c42c01a223a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.py
@@ -33,7 +33,7 @@ class SelfReferencingArrayModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ def items() -> typing.Type['SelfReferencingArrayModel']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['SelfReferencingArrayModel'], typing.List['SelfReferencingArrayModel']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['SelfReferencingArrayModel'], typing.List['SelfReferencingArrayModel']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'SelfReferencingArrayModel':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'SelfReferencingArrayModel':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.pyi
index 2c46c2d3224..c42c01a223a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_array_model.pyi
@@ -33,7 +33,7 @@ class SelfReferencingArrayModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -42,13 +42,13 @@ class SelfReferencingArrayModel(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['SelfReferencingArrayModel'], typing.List['SelfReferencingArrayModel']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['SelfReferencingArrayModel'], typing.List['SelfReferencingArrayModel']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'SelfReferencingArrayModel':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'SelfReferencingArrayModel':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.py
index 2526793e215..505eab134d4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.py
@@ -33,7 +33,7 @@ class SelfReferencingObjectModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -66,31 +66,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["selfRef"]) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["selfRef"]) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["selfRef"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         selfRef: typing.Union['SelfReferencingObjectModel', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'SelfReferencingObjectModel',
     ) -> 'SelfReferencingObjectModel':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             selfRef=selfRef,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.pyi
index 4e84d3d8445..1abe39a6be1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/self_referencing_object_model.pyi
@@ -33,7 +33,7 @@ class SelfReferencingObjectModel(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -65,31 +65,31 @@ class SelfReferencingObjectModel(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["selfRef"]) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["selfRef"]) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union['SelfReferencingObjectModel', schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["selfRef"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         selfRef: typing.Union['SelfReferencingObjectModel', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: 'SelfReferencingObjectModel',
     ) -> 'SelfReferencingObjectModel':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             selfRef=selfRef,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.py
index 900ca4f70e2..ff7daa95750 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.py
@@ -33,7 +33,7 @@ class Shape(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ def one_of1() -> typing.Type['quadrilateral.Quadrilateral']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Shape':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.pyi
index 900ca4f70e2..ff7daa95750 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape.pyi
@@ -33,7 +33,7 @@ class Shape(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -62,14 +62,14 @@ class Shape(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Shape':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.py
index b16abe77fac..917e7ad1bcd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.py
@@ -35,7 +35,7 @@ class ShapeOrNull(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -66,14 +66,14 @@ def one_of2() -> typing.Type['quadrilateral.Quadrilateral']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.pyi
index b16abe77fac..917e7ad1bcd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/shape_or_null.pyi
@@ -35,7 +35,7 @@ class ShapeOrNull(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -66,14 +66,14 @@ class ShapeOrNull(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ShapeOrNull':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.py
index 757220706eb..f6bcc8b4af3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.py
@@ -33,7 +33,7 @@ class SimpleQuadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class AllOf1(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {frozendict.frozendict}
                     
                     class Properties:
@@ -59,7 +59,7 @@ class QuadrilateralType(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -75,7 +75,7 @@ def SIMPLE_QUADRILATERAL(cls):
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -91,32 +91,32 @@ def __getitem__(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.Properties.QuadrilateralType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[Schema_.Properties.QuadrilateralType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["quadrilateralType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         quadrilateralType=quadrilateralType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -127,14 +127,14 @@ def __new__(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.pyi
index 4d40dc086ba..68828de8d47 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/simple_quadrilateral.pyi
@@ -33,7 +33,7 @@ class SimpleQuadrilateral(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,7 +48,7 @@ class SimpleQuadrilateral(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     
                     class Properties:
                         
@@ -65,7 +65,7 @@ class SimpleQuadrilateral(
                         }
                 
                 @typing.overload
-                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> MetaOapg.Properties.QuadrilateralType: ...
+                def __getitem__(self, name: typing_extensions.Literal["quadrilateralType"]) -> Schema_.Properties.QuadrilateralType: ...
                 
                 @typing.overload
                 def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,32 +81,32 @@ class SimpleQuadrilateral(
                     return super().__getitem__(name)
                 
                 @typing.overload
-                def get_item_oapg(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[MetaOapg.Properties.QuadrilateralType, schemas.Unset]: ...
+                def get_item_(self, name: typing_extensions.Literal["quadrilateralType"]) -> typing.Union[Schema_.Properties.QuadrilateralType, schemas.Unset]: ...
                 
                 @typing.overload
-                def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+                def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
                 
-                def get_item_oapg(
+                def get_item_(
                     self,
                     name: typing.Union[
                         typing_extensions.Literal["quadrilateralType"],
                         str
                     ]
                 ):
-                    return super().get_item_oapg(name)
+                    return super().get_item_(name)
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, ],
-                    quadrilateralType: typing.Union[MetaOapg.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, ],
+                    quadrilateralType: typing.Union[Schema_.Properties.QuadrilateralType, str, schemas.Unset] = schemas.unset,
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AllOf1':
                     return super().__new__(
                         cls,
-                        *_args,
+                        *args_,
                         quadrilateralType=quadrilateralType,
-                        _configuration=_configuration,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             classes = [
@@ -117,14 +117,14 @@ class SimpleQuadrilateral(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SimpleQuadrilateral':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.py
index 755856e031f..6684c0fb6a1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.py
@@ -33,7 +33,7 @@ class SomeObject(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,14 +48,14 @@ def all_of0() -> typing.Type['object_interface.ObjectInterface']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.pyi
index 755856e031f..6684c0fb6a1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/some_object.pyi
@@ -33,7 +33,7 @@ class SomeObject(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -48,14 +48,14 @@ class SomeObject(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SomeObject':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.py
index d97cdb9d171..37f9961f91d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.py
@@ -35,7 +35,7 @@ class SpecialModelName(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,7 +45,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -61,31 +61,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union[MetaOapg.Properties.A, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> typing.Union[Schema_.Properties.A, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.pyi
index 483685f42e7..b2d02028cde 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/special_model_name.pyi
@@ -35,7 +35,7 @@ class SpecialModelName(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             A = schemas.StrSchema
@@ -44,7 +44,7 @@ class SpecialModelName(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["a"]) -> MetaOapg.Properties.A: ...
+    def __getitem__(self, name: typing_extensions.Literal["a"]) -> Schema_.Properties.A: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,31 +60,31 @@ class SpecialModelName(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["a"]) -> typing.Union[MetaOapg.Properties.A, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["a"]) -> typing.Union[Schema_.Properties.A, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["a"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        a: typing.Union[MetaOapg.Properties.A, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        a: typing.Union[Schema_.Properties.A, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'SpecialModelName':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             a=a,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.py
index a3ce24c2256..32ffdab294d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.py
@@ -33,26 +33,26 @@ class StringBooleanMap(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         AdditionalProperties = schemas.BoolSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'StringBooleanMap':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.pyi
index 97a5b0c63a2..ebdd93c6c4f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_boolean_map.pyi
@@ -33,25 +33,25 @@ class StringBooleanMap(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         AdditionalProperties = schemas.BoolSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, bool, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, bool, ],
     ) -> 'StringBooleanMap':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.py
index d039891e075..998c2425c65 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.py
@@ -36,7 +36,7 @@ class StringEnum(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             str,
@@ -82,11 +82,11 @@ def NONE(cls):
 
     def __new__(
         cls,
-        *_args: typing.Union[None, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'StringEnum':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.pyi
index d039891e075..998c2425c65 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum.pyi
@@ -36,7 +36,7 @@ class StringEnum(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             schemas.NoneClass,
             str,
@@ -82,11 +82,11 @@ class StringEnum(
 
     def __new__(
         cls,
-        *_args: typing.Union[None, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[None, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'StringEnum':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum_with_default_value.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum_with_default_value.py
index 49681f57679..ac212c04bd4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_enum_with_default_value.py
@@ -33,7 +33,7 @@ class StringEnumWithDefaultValue(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_with_validation.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_with_validation.py
index 660e82a01f7..910e74e698f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_with_validation.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/string_with_validation.py
@@ -33,7 +33,7 @@ class StringWithValidation(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.py
index 06a373e11f4..bd159c211da 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.py
@@ -33,7 +33,7 @@ class Tag(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -45,10 +45,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Tag':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             name=name,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.pyi
index 19f163c7506..c8d087d0f3f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/tag.pyi
@@ -33,7 +33,7 @@ class Tag(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Id = schemas.Int64Schema
@@ -44,10 +44,10 @@ class Tag(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class Tag(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -80,21 +80,21 @@ class Tag(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Tag':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             name=name,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.py
index 1cdd2661274..1372e36aa01 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.py
@@ -33,7 +33,7 @@ class Triangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -68,14 +68,14 @@ def one_of2() -> typing.Type['scalene_triangle.ScaleneTriangle']:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Triangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.pyi
index 1cdd2661274..1372e36aa01 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle.pyi
@@ -33,7 +33,7 @@ class Triangle(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         @staticmethod
@@ -68,14 +68,14 @@ class Triangle(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Triangle':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.py
index 3cdbfa2873c..baa99f9a446 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.py
@@ -33,7 +33,7 @@ class TriangleInterface(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "shapeType",
@@ -48,7 +48,7 @@ class ShapeType(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -66,14 +66,14 @@ def TRIANGLE(cls):
             }
 
     
-    shapeType: MetaOapg.Properties.ShapeType
-    triangleType: MetaOapg.Properties.TriangleType
+    shapeType: Schema_.Properties.ShapeType
+    triangleType: Schema_.Properties.TriangleType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -90,15 +90,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+    def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["shapeType"],
@@ -106,21 +106,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        shapeType: typing.Union[MetaOapg.Properties.ShapeType, str, ],
-        triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        shapeType: typing.Union[Schema_.Properties.ShapeType, str, ],
+        triangleType: typing.Union[Schema_.Properties.TriangleType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             shapeType=shapeType,
             triangleType=triangleType,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.pyi
index bc91975284d..8f3e5eb9818 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/triangle_interface.pyi
@@ -33,7 +33,7 @@ class TriangleInterface(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         required = {
             "shapeType",
@@ -57,14 +57,14 @@ class TriangleInterface(
             }
 
     
-    shapeType: MetaOapg.Properties.ShapeType
-    triangleType: MetaOapg.Properties.TriangleType
+    shapeType: Schema_.Properties.ShapeType
+    triangleType: Schema_.Properties.TriangleType
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def __getitem__(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+    def __getitem__(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -81,15 +81,15 @@ class TriangleInterface(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["shapeType"]) -> MetaOapg.Properties.ShapeType: ...
+    def get_item_(self, name: typing_extensions.Literal["shapeType"]) -> Schema_.Properties.ShapeType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["triangleType"]) -> MetaOapg.Properties.TriangleType: ...
+    def get_item_(self, name: typing_extensions.Literal["triangleType"]) -> Schema_.Properties.TriangleType: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["shapeType"],
@@ -97,21 +97,21 @@ class TriangleInterface(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        shapeType: typing.Union[MetaOapg.Properties.ShapeType, str, ],
-        triangleType: typing.Union[MetaOapg.Properties.TriangleType, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        shapeType: typing.Union[Schema_.Properties.ShapeType, str, ],
+        triangleType: typing.Union[Schema_.Properties.TriangleType, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'TriangleInterface':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             shapeType=shapeType,
             triangleType=triangleType,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.py
index 556c2cb9ca4..71519da89b0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.py
@@ -33,7 +33,7 @@ class User(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -56,7 +56,7 @@ class ObjectWithNoDeclaredPropsNullable(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -65,14 +65,14 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'ObjectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             AnyTypeProp = schemas.AnyTypeSchema
@@ -83,21 +83,21 @@ class AnyTypeExceptNullProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     _Not = schemas.NoneSchema
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyTypeExceptNullProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             AnyTypePropNullable = schemas.AnyTypeSchema
@@ -118,43 +118,43 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["username"]) -> MetaOapg.Properties.Username: ...
+    def __getitem__(self, name: typing_extensions.Literal["username"]) -> Schema_.Properties.Username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> MetaOapg.Properties.FirstName: ...
+    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> Schema_.Properties.FirstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> MetaOapg.Properties.LastName: ...
+    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> Schema_.Properties.LastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["email"]) -> MetaOapg.Properties.Email: ...
+    def __getitem__(self, name: typing_extensions.Literal["email"]) -> Schema_.Properties.Email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> MetaOapg.Properties.Phone: ...
+    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> Schema_.Properties.Phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> MetaOapg.Properties.UserStatus: ...
+    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> Schema_.Properties.UserStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.Properties.ObjectWithNoDeclaredProps: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> Schema_.Properties.ObjectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> Schema_.Properties.ObjectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> MetaOapg.Properties.AnyTypeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> Schema_.Properties.AnyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> MetaOapg.Properties.AnyTypeExceptNullProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> Schema_.Properties.AnyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> MetaOapg.Properties.AnyTypePropNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> Schema_.Properties.AnyTypePropNullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -182,48 +182,48 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["username"]) -> typing.Union[MetaOapg.Properties.Username, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["username"]) -> typing.Union[Schema_.Properties.Username, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[MetaOapg.Properties.FirstName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[Schema_.Properties.FirstName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[MetaOapg.Properties.LastName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[Schema_.Properties.LastName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["email"]) -> typing.Union[MetaOapg.Properties.Email, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["email"]) -> typing.Union[Schema_.Properties.Email, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.Properties.Password, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> typing.Union[Schema_.Properties.Password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["phone"]) -> typing.Union[MetaOapg.Properties.Phone, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["phone"]) -> typing.Union[Schema_.Properties.Phone, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[MetaOapg.Properties.UserStatus, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[Schema_.Properties.UserStatus, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredProps, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[Schema_.Properties.ObjectWithNoDeclaredProps, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[Schema_.Properties.ObjectWithNoDeclaredPropsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.Properties.AnyTypeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[Schema_.Properties.AnyTypeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.Properties.AnyTypeExceptNullProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[Schema_.Properties.AnyTypeExceptNullProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.Properties.AnyTypePropNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[Schema_.Properties.AnyTypePropNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -242,30 +242,30 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        username: typing.Union[MetaOapg.Properties.Username, str, schemas.Unset] = schemas.unset,
-        firstName: typing.Union[MetaOapg.Properties.FirstName, str, schemas.Unset] = schemas.unset,
-        lastName: typing.Union[MetaOapg.Properties.LastName, str, schemas.Unset] = schemas.unset,
-        email: typing.Union[MetaOapg.Properties.Email, str, schemas.Unset] = schemas.unset,
-        password: typing.Union[MetaOapg.Properties.Password, str, schemas.Unset] = schemas.unset,
-        phone: typing.Union[MetaOapg.Properties.Phone, str, schemas.Unset] = schemas.unset,
-        userStatus: typing.Union[MetaOapg.Properties.UserStatus, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        objectWithNoDeclaredProps: typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredProps, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        objectWithNoDeclaredPropsNullable: typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        anyTypeProp: typing.Union[MetaOapg.Properties.AnyTypeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        anyTypeExceptNullProp: typing.Union[MetaOapg.Properties.AnyTypeExceptNullProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        anyTypePropNullable: typing.Union[MetaOapg.Properties.AnyTypePropNullable, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        username: typing.Union[Schema_.Properties.Username, str, schemas.Unset] = schemas.unset,
+        firstName: typing.Union[Schema_.Properties.FirstName, str, schemas.Unset] = schemas.unset,
+        lastName: typing.Union[Schema_.Properties.LastName, str, schemas.Unset] = schemas.unset,
+        email: typing.Union[Schema_.Properties.Email, str, schemas.Unset] = schemas.unset,
+        password: typing.Union[Schema_.Properties.Password, str, schemas.Unset] = schemas.unset,
+        phone: typing.Union[Schema_.Properties.Phone, str, schemas.Unset] = schemas.unset,
+        userStatus: typing.Union[Schema_.Properties.UserStatus, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        objectWithNoDeclaredProps: typing.Union[Schema_.Properties.ObjectWithNoDeclaredProps, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        objectWithNoDeclaredPropsNullable: typing.Union[Schema_.Properties.ObjectWithNoDeclaredPropsNullable, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        anyTypeProp: typing.Union[Schema_.Properties.AnyTypeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        anyTypeExceptNullProp: typing.Union[Schema_.Properties.AnyTypeExceptNullProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        anyTypePropNullable: typing.Union[Schema_.Properties.AnyTypePropNullable, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'User':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             username=username,
             firstName=firstName,
@@ -279,6 +279,6 @@ def __new__(
             anyTypeProp=anyTypeProp,
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.pyi
index 8ffac09429b..7a5f737078d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/user.pyi
@@ -33,7 +33,7 @@ class User(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Id = schemas.Int64Schema
@@ -55,7 +55,7 @@ class User(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         schemas.NoneClass,
                         frozendict.frozendict,
@@ -64,14 +64,14 @@ class User(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, None, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, None, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'ObjectWithNoDeclaredPropsNullable':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             AnyTypeProp = schemas.AnyTypeSchema
@@ -82,21 +82,21 @@ class User(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     _Not = schemas.NoneSchema
             
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'AnyTypeExceptNullProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             AnyTypePropNullable = schemas.AnyTypeSchema
@@ -117,43 +117,43 @@ class User(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["id"]) -> MetaOapg.Properties.Id: ...
+    def __getitem__(self, name: typing_extensions.Literal["id"]) -> Schema_.Properties.Id: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["username"]) -> MetaOapg.Properties.Username: ...
+    def __getitem__(self, name: typing_extensions.Literal["username"]) -> Schema_.Properties.Username: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> MetaOapg.Properties.FirstName: ...
+    def __getitem__(self, name: typing_extensions.Literal["firstName"]) -> Schema_.Properties.FirstName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> MetaOapg.Properties.LastName: ...
+    def __getitem__(self, name: typing_extensions.Literal["lastName"]) -> Schema_.Properties.LastName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["email"]) -> MetaOapg.Properties.Email: ...
+    def __getitem__(self, name: typing_extensions.Literal["email"]) -> Schema_.Properties.Email: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> MetaOapg.Properties.Phone: ...
+    def __getitem__(self, name: typing_extensions.Literal["phone"]) -> Schema_.Properties.Phone: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> MetaOapg.Properties.UserStatus: ...
+    def __getitem__(self, name: typing_extensions.Literal["userStatus"]) -> Schema_.Properties.UserStatus: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> MetaOapg.Properties.ObjectWithNoDeclaredProps: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> Schema_.Properties.ObjectWithNoDeclaredProps: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> Schema_.Properties.ObjectWithNoDeclaredPropsNullable: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> MetaOapg.Properties.AnyTypeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeProp"]) -> Schema_.Properties.AnyTypeProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> MetaOapg.Properties.AnyTypeExceptNullProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> Schema_.Properties.AnyTypeExceptNullProp: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> MetaOapg.Properties.AnyTypePropNullable: ...
+    def __getitem__(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> Schema_.Properties.AnyTypePropNullable: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -181,48 +181,48 @@ class User(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["id"]) -> typing.Union[MetaOapg.Properties.Id, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["id"]) -> typing.Union[Schema_.Properties.Id, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["username"]) -> typing.Union[MetaOapg.Properties.Username, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["username"]) -> typing.Union[Schema_.Properties.Username, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[MetaOapg.Properties.FirstName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["firstName"]) -> typing.Union[Schema_.Properties.FirstName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[MetaOapg.Properties.LastName, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["lastName"]) -> typing.Union[Schema_.Properties.LastName, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["email"]) -> typing.Union[MetaOapg.Properties.Email, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["email"]) -> typing.Union[Schema_.Properties.Email, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.Properties.Password, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> typing.Union[Schema_.Properties.Password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["phone"]) -> typing.Union[MetaOapg.Properties.Phone, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["phone"]) -> typing.Union[Schema_.Properties.Phone, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[MetaOapg.Properties.UserStatus, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["userStatus"]) -> typing.Union[Schema_.Properties.UserStatus, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredProps, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["objectWithNoDeclaredProps"]) -> typing.Union[Schema_.Properties.ObjectWithNoDeclaredProps, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["objectWithNoDeclaredPropsNullable"]) -> typing.Union[Schema_.Properties.ObjectWithNoDeclaredPropsNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[MetaOapg.Properties.AnyTypeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypeProp"]) -> typing.Union[Schema_.Properties.AnyTypeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[MetaOapg.Properties.AnyTypeExceptNullProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypeExceptNullProp"]) -> typing.Union[Schema_.Properties.AnyTypeExceptNullProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[MetaOapg.Properties.AnyTypePropNullable, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["anyTypePropNullable"]) -> typing.Union[Schema_.Properties.AnyTypePropNullable, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["id"],
@@ -241,30 +241,30 @@ class User(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        id: typing.Union[MetaOapg.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        username: typing.Union[MetaOapg.Properties.Username, str, schemas.Unset] = schemas.unset,
-        firstName: typing.Union[MetaOapg.Properties.FirstName, str, schemas.Unset] = schemas.unset,
-        lastName: typing.Union[MetaOapg.Properties.LastName, str, schemas.Unset] = schemas.unset,
-        email: typing.Union[MetaOapg.Properties.Email, str, schemas.Unset] = schemas.unset,
-        password: typing.Union[MetaOapg.Properties.Password, str, schemas.Unset] = schemas.unset,
-        phone: typing.Union[MetaOapg.Properties.Phone, str, schemas.Unset] = schemas.unset,
-        userStatus: typing.Union[MetaOapg.Properties.UserStatus, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        objectWithNoDeclaredProps: typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredProps, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
-        objectWithNoDeclaredPropsNullable: typing.Union[MetaOapg.Properties.ObjectWithNoDeclaredPropsNullable, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
-        anyTypeProp: typing.Union[MetaOapg.Properties.AnyTypeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        anyTypeExceptNullProp: typing.Union[MetaOapg.Properties.AnyTypeExceptNullProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        anyTypePropNullable: typing.Union[MetaOapg.Properties.AnyTypePropNullable, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        id: typing.Union[Schema_.Properties.Id, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        username: typing.Union[Schema_.Properties.Username, str, schemas.Unset] = schemas.unset,
+        firstName: typing.Union[Schema_.Properties.FirstName, str, schemas.Unset] = schemas.unset,
+        lastName: typing.Union[Schema_.Properties.LastName, str, schemas.Unset] = schemas.unset,
+        email: typing.Union[Schema_.Properties.Email, str, schemas.Unset] = schemas.unset,
+        password: typing.Union[Schema_.Properties.Password, str, schemas.Unset] = schemas.unset,
+        phone: typing.Union[Schema_.Properties.Phone, str, schemas.Unset] = schemas.unset,
+        userStatus: typing.Union[Schema_.Properties.UserStatus, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        objectWithNoDeclaredProps: typing.Union[Schema_.Properties.ObjectWithNoDeclaredProps, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
+        objectWithNoDeclaredPropsNullable: typing.Union[Schema_.Properties.ObjectWithNoDeclaredPropsNullable, dict, frozendict.frozendict, None, schemas.Unset] = schemas.unset,
+        anyTypeProp: typing.Union[Schema_.Properties.AnyTypeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        anyTypeExceptNullProp: typing.Union[Schema_.Properties.AnyTypeExceptNullProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        anyTypePropNullable: typing.Union[Schema_.Properties.AnyTypePropNullable, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'User':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             id=id,
             username=username,
             firstName=firstName,
@@ -278,6 +278,6 @@ class User(
             anyTypeProp=anyTypeProp,
             anyTypeExceptNullProp=anyTypeExceptNullProp,
             anyTypePropNullable=anyTypePropNullable,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/uuid_string.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/uuid_string.py
index 53b39215b41..73352c429dd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/uuid_string.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/uuid_string.py
@@ -33,7 +33,7 @@ class UUIDString(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.py
index 1d02584aa09..19e81e295f6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.py
@@ -33,7 +33,7 @@ class Whale(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "className",
@@ -49,7 +49,7 @@ class ClassName(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -66,16 +66,16 @@ def WHALE(cls):
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> MetaOapg.Properties.HasBaleen: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> Schema_.Properties.HasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> MetaOapg.Properties.HasTeeth: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> Schema_.Properties.HasTeeth: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -93,18 +93,18 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[MetaOapg.Properties.HasBaleen, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[Schema_.Properties.HasBaleen, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[MetaOapg.Properties.HasTeeth, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[Schema_.Properties.HasTeeth, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -113,23 +113,23 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        hasBaleen: typing.Union[MetaOapg.Properties.HasBaleen, bool, schemas.Unset] = schemas.unset,
-        hasTeeth: typing.Union[MetaOapg.Properties.HasTeeth, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        hasBaleen: typing.Union[Schema_.Properties.HasBaleen, bool, schemas.Unset] = schemas.unset,
+        hasTeeth: typing.Union[Schema_.Properties.HasTeeth, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Whale':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.pyi
index f228a2fe869..b230bd84103 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/whale.pyi
@@ -33,7 +33,7 @@ class Whale(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "className",
         }
@@ -56,16 +56,16 @@ class Whale(
                 "className": ClassName,
             }
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> MetaOapg.Properties.HasBaleen: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasBaleen"]) -> Schema_.Properties.HasBaleen: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> MetaOapg.Properties.HasTeeth: ...
+    def __getitem__(self, name: typing_extensions.Literal["hasTeeth"]) -> Schema_.Properties.HasTeeth: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -83,18 +83,18 @@ class Whale(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[MetaOapg.Properties.HasBaleen, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["hasBaleen"]) -> typing.Union[Schema_.Properties.HasBaleen, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[MetaOapg.Properties.HasTeeth, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["hasTeeth"]) -> typing.Union[Schema_.Properties.HasTeeth, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -103,23 +103,23 @@ class Whale(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        hasBaleen: typing.Union[MetaOapg.Properties.HasBaleen, bool, schemas.Unset] = schemas.unset,
-        hasTeeth: typing.Union[MetaOapg.Properties.HasTeeth, bool, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        hasBaleen: typing.Union[Schema_.Properties.HasBaleen, bool, schemas.Unset] = schemas.unset,
+        hasTeeth: typing.Union[Schema_.Properties.HasTeeth, bool, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Whale':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             hasBaleen=hasBaleen,
             hasTeeth=hasTeeth,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.py b/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.py
index 0053e944777..27c046f00a3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.py
@@ -33,7 +33,7 @@ class Zebra(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "className",
@@ -47,7 +47,7 @@ class Type(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -75,7 +75,7 @@ class ClassName(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -92,16 +92,16 @@ def ZEBRA(cls):
             }
         AdditionalProperties = schemas.AnyTypeSchema
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.Properties.Type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> Schema_.Properties.Type: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -115,15 +115,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.Properties.Type, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["type"]) -> typing.Union[Schema_.Properties.Type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -131,21 +131,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        type: typing.Union[MetaOapg.Properties.Type, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        type: typing.Union[Schema_.Properties.Type, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     ) -> 'Zebra':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             type=type,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.pyi b/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.pyi
index 1f724dead4d..f56e43cb863 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/components/schema/zebra.pyi
@@ -33,7 +33,7 @@ class Zebra(
     """
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "className",
         }
@@ -71,16 +71,16 @@ class Zebra(
             }
         AdditionalProperties = schemas.AnyTypeSchema
     
-    className: MetaOapg.Properties.ClassName
+    className: Schema_.Properties.ClassName
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def __getitem__(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["type"]) -> MetaOapg.Properties.Type: ...
+    def __getitem__(self, name: typing_extensions.Literal["type"]) -> Schema_.Properties.Type: ...
     
     @typing.overload
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties: ...
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties: ...
     
     def __getitem__(
         self,
@@ -94,15 +94,15 @@ class Zebra(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["className"]) -> MetaOapg.Properties.ClassName: ...
+    def get_item_(self, name: typing_extensions.Literal["className"]) -> Schema_.Properties.ClassName: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["type"]) -> typing.Union[MetaOapg.Properties.Type, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["type"]) -> typing.Union[Schema_.Properties.Type, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[MetaOapg.AdditionalProperties, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[Schema_.AdditionalProperties, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["className"],
@@ -110,21 +110,21 @@ class Zebra(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        className: typing.Union[MetaOapg.Properties.ClassName, str, ],
-        type: typing.Union[MetaOapg.Properties.Type, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        className: typing.Union[Schema_.Properties.ClassName, str, ],
+        type: typing.Union[Schema_.Properties.Type, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
     ) -> 'Zebra':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             className=className,
             type=type,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.py
index 10390e827fe..41b75fa6584 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -60,7 +60,7 @@ def _call_123_test_special_tags_oapg(
     ]: ...
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -74,7 +74,7 @@ def _call_123_test_special_tags_oapg(
 
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -85,7 +85,7 @@ def _call_123_test_special_tags_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -98,7 +98,7 @@ def _call_123_test_special_tags_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -228,7 +228,7 @@ def call_123_test_special_tags(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._call_123_test_special_tags_oapg(
+        return self._call_123_test_special_tags(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -302,7 +302,7 @@ def patch(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._call_123_test_special_tags_oapg(
+        return self._call_123_test_special_tags(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.pyi
index a94b0ff5266..ad52a6b300f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/another_fake_dummy/patch/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _call_123_test_special_tags_oapg(
+    def _call_123_test_special_tags(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -216,7 +216,7 @@ class Call123TestSpecialTags(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._call_123_test_special_tags_oapg(
+        return self._call_123_test_special_tags(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -290,7 +290,7 @@ class ApiForpatch(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._call_123_test_special_tags_oapg(
+        return self._call_123_test_special_tags(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.py
index 59643f7a3e7..921c0660075 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.py
@@ -107,7 +107,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -119,7 +119,7 @@ def _group_parameters_oapg(
     ]: ...
 
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -129,7 +129,7 @@ def _group_parameters_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -141,7 +141,7 @@ def _group_parameters_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -155,8 +155,8 @@ def _group_parameters_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -256,7 +256,7 @@ def group_parameters(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._group_parameters_oapg(
+        return self._group_parameters(
             query_params=query_params,
             header_params=header_params,
             stream=stream,
@@ -311,7 +311,7 @@ def delete(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._group_parameters_oapg(
+        return self._group_parameters(
             query_params=query_params,
             header_params=header_params,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.pyi
index 401510a1de9..573f431186e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/__init__.pyi
@@ -91,7 +91,7 @@ class RequestHeaderParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -103,7 +103,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -113,7 +113,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -125,7 +125,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _group_parameters_oapg(
+    def _group_parameters(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -139,8 +139,8 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -240,7 +240,7 @@ class GroupParameters(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._group_parameters_oapg(
+        return self._group_parameters(
             query_params=query_params,
             header_params=header_params,
             stream=stream,
@@ -295,7 +295,7 @@ class ApiFordelete(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._group_parameters_oapg(
+        return self._group_parameters(
             query_params=query_params,
             header_params=header_params,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_1/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_1/schema.py
index 58be4bca6b0..2acd04c1c79 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_1/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_1/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_4/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_4/schema.py
index 58be4bca6b0..2acd04c1c79 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_4/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/delete/parameter_4/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.py
index b4731697d18..f3ae54ab36a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.py
@@ -110,7 +110,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -125,7 +125,7 @@ def _enum_parameters_oapg(
     ]: ...
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -141,7 +141,7 @@ def _enum_parameters_oapg(
 
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -154,7 +154,7 @@ def _enum_parameters_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -169,7 +169,7 @@ def _enum_parameters_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -186,8 +186,8 @@ def _enum_parameters_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -329,7 +329,7 @@ def enum_parameters(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._enum_parameters_oapg(
+        return self._enum_parameters(
             body=body,
             query_params=query_params,
             header_params=header_params,
@@ -415,7 +415,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._enum_parameters_oapg(
+        return self._enum_parameters(
             body=body,
             query_params=query_params,
             header_params=header_params,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.pyi
index 8d48cfe1097..96e507ae5dc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/__init__.pyi
@@ -96,7 +96,7 @@ class RequestHeaderParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -111,7 +111,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -127,7 +127,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -140,7 +140,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -155,7 +155,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _enum_parameters_oapg(
+    def _enum_parameters(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -172,8 +172,8 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -315,7 +315,7 @@ class EnumParameters(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._enum_parameters_oapg(
+        return self._enum_parameters(
             body=body,
             query_params=query_params,
             header_params=header_params,
@@ -401,7 +401,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._enum_parameters_oapg(
+        return self._enum_parameters(
             body=body,
             query_params=query_params,
             header_params=header_params,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.py
index a9592d3e308..2c957953c1e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -37,7 +37,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     str,
                 }
@@ -56,14 +56,14 @@ def DOLLAR(cls):
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.pyi
index dc3d06e6992..ecb68992ffc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_0/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -46,14 +46,14 @@ class Schema(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_1/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_1/schema.py
index a41443c6705..20ad88c78e0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_1/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_1/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.py
index a9592d3e308..2c957953c1e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -37,7 +37,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     str,
                 }
@@ -56,14 +56,14 @@ def DOLLAR(cls):
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.pyi
index dc3d06e6992..ecb68992ffc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_2/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -46,14 +46,14 @@ class Schema(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_3/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_3/schema.py
index a41443c6705..20ad88c78e0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_3/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_3/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             str,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_4/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_4/schema.py
index 1232424ffaa..b978c98048f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_4/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_4/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_5/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_5/schema.py
index 027be1b4467..4b080152e44 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_5/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/parameter_5/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.py
index 0466eb024ed..9187d205bba 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.py
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -39,7 +39,7 @@ class EnumFormStringArray(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -48,7 +48,7 @@ class Items(
                     ):
                     
                     
-                        class MetaOapg:
+                        class Schema_:
                             types = {
                                 str,
                             }
@@ -67,16 +67,16 @@ def DOLLAR(cls):
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'EnumFormStringArray':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -85,7 +85,7 @@ class EnumFormString(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -112,10 +112,10 @@ def XYZ(cls):
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> MetaOapg.Properties.EnumFormStringArray: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> Schema_.Properties.EnumFormStringArray: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> MetaOapg.Properties.EnumFormString: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> Schema_.Properties.EnumFormString: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -132,15 +132,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.Properties.EnumFormStringArray, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[Schema_.Properties.EnumFormStringArray, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[MetaOapg.Properties.EnumFormString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[Schema_.Properties.EnumFormString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["enum_form_string_array"],
@@ -148,21 +148,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        enum_form_string_array: typing.Union[MetaOapg.Properties.EnumFormStringArray, list, tuple, schemas.Unset] = schemas.unset,
-        enum_form_string: typing.Union[MetaOapg.Properties.EnumFormString, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        enum_form_string_array: typing.Union[Schema_.Properties.EnumFormStringArray, list, tuple, schemas.Unset] = schemas.unset,
+        enum_form_string: typing.Union[Schema_.Properties.EnumFormString, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.pyi
index 0ad44e2ca44..4751f6ee107 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/get/request_body/application_x_www_form_urlencoded.pyi
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -38,7 +38,7 @@ class ApplicationXWwwFormUrlencoded(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     
                     
@@ -56,16 +56,16 @@ class ApplicationXWwwFormUrlencoded(
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'EnumFormStringArray':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             
             
@@ -90,10 +90,10 @@ class ApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> MetaOapg.Properties.EnumFormStringArray: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string_array"]) -> Schema_.Properties.EnumFormStringArray: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> MetaOapg.Properties.EnumFormString: ...
+    def __getitem__(self, name: typing_extensions.Literal["enum_form_string"]) -> Schema_.Properties.EnumFormString: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -110,15 +110,15 @@ class ApplicationXWwwFormUrlencoded(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[MetaOapg.Properties.EnumFormStringArray, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_form_string_array"]) -> typing.Union[Schema_.Properties.EnumFormStringArray, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[MetaOapg.Properties.EnumFormString, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["enum_form_string"]) -> typing.Union[Schema_.Properties.EnumFormString, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["enum_form_string_array"],
@@ -126,21 +126,21 @@ class ApplicationXWwwFormUrlencoded(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        enum_form_string_array: typing.Union[MetaOapg.Properties.EnumFormStringArray, list, tuple, schemas.Unset] = schemas.unset,
-        enum_form_string: typing.Union[MetaOapg.Properties.EnumFormString, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        enum_form_string_array: typing.Union[Schema_.Properties.EnumFormStringArray, list, tuple, schemas.Unset] = schemas.unset,
+        enum_form_string: typing.Union[Schema_.Properties.EnumFormString, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             enum_form_string_array=enum_form_string_array,
             enum_form_string=enum_form_string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.py
index 7d815afe1b1..bc4ba89c884 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -60,7 +60,7 @@ def _client_model_oapg(
     ]: ...
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -74,7 +74,7 @@ def _client_model_oapg(
 
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -85,7 +85,7 @@ def _client_model_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -98,7 +98,7 @@ def _client_model_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -228,7 +228,7 @@ def client_model(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._client_model_oapg(
+        return self._client_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -302,7 +302,7 @@ def patch(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._client_model_oapg(
+        return self._client_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.pyi
index a4277b77f87..ad5b909681b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/patch/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _client_model_oapg(
+    def _client_model(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -216,7 +216,7 @@ class ClientModel(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._client_model_oapg(
+        return self._client_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -290,7 +290,7 @@ class ApiForpatch(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._client_model_oapg(
+        return self._client_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.py
index a44465367ea..3e928d3fca3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.py
@@ -51,7 +51,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -63,7 +63,7 @@ def _endpoint_parameters_oapg(
     ]: ...
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -76,7 +76,7 @@ def _endpoint_parameters_oapg(
 
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -86,7 +86,7 @@ def _endpoint_parameters_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _endpoint_parameters_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -219,7 +219,7 @@ def endpoint_parameters(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._endpoint_parameters_oapg(
+        return self._endpoint_parameters(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -287,7 +287,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._endpoint_parameters_oapg(
+        return self._endpoint_parameters(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.pyi
index b9a36b7bbca..1a487bf25b3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/__init__.pyi
@@ -33,7 +33,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -58,7 +58,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -68,7 +68,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -80,7 +80,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _endpoint_parameters_oapg(
+    def _endpoint_parameters(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -201,7 +201,7 @@ class EndpointParameters(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._endpoint_parameters_oapg(
+        return self._endpoint_parameters(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -269,7 +269,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._endpoint_parameters_oapg(
+        return self._endpoint_parameters(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.py
index c93db4fd8e0..367b6b3e198 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.py
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "byte",
@@ -45,7 +45,7 @@ class Integer(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -59,7 +59,7 @@ class Int32(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -74,7 +74,7 @@ class Number(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -87,7 +87,7 @@ class _Float(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -100,7 +100,7 @@ class Double(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         decimal.Decimal,
                     }
@@ -114,7 +114,7 @@ class String(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -131,7 +131,7 @@ class PatternWithoutDelimiter(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -149,7 +149,7 @@ class Password(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -174,52 +174,52 @@ class MetaOapg:
                 "callback": Callback,
             }
     
-    byte: MetaOapg.Properties.Byte
-    double: MetaOapg.Properties.Double
-    number: MetaOapg.Properties.Number
-    pattern_without_delimiter: MetaOapg.Properties.PatternWithoutDelimiter
+    byte: Schema_.Properties.Byte
+    double: Schema_.Properties.Double
+    number: Schema_.Properties.Number
+    pattern_without_delimiter: Schema_.Properties.PatternWithoutDelimiter
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.Properties.PatternWithoutDelimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> Schema_.Properties.PatternWithoutDelimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.Properties.Integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> Schema_.Properties.Integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.Properties.String: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> Schema_.Properties.String: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> MetaOapg.Properties.Callback: ...
+    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> Schema_.Properties.Callback: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -248,51 +248,51 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def get_item_(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.Properties.PatternWithoutDelimiter: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> Schema_.Properties.PatternWithoutDelimiter: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.Properties.Integer, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer"]) -> typing.Union[Schema_.Properties.Integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.Properties.String, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union[Schema_.Properties.String, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.Properties.Date, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> typing.Union[Schema_.Properties.Date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.Properties.Password, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> typing.Union[Schema_.Properties.Password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["callback"]) -> typing.Union[MetaOapg.Properties.Callback, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["callback"]) -> typing.Union[Schema_.Properties.Callback, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["byte"],
@@ -312,30 +312,30 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        byte: typing.Union[MetaOapg.Properties.Byte, str, ],
-        double: typing.Union[MetaOapg.Properties.Double, decimal.Decimal, int, float, ],
-        number: typing.Union[MetaOapg.Properties.Number, decimal.Decimal, int, float, ],
-        pattern_without_delimiter: typing.Union[MetaOapg.Properties.PatternWithoutDelimiter, str, ],
-        integer: typing.Union[MetaOapg.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        string: typing.Union[MetaOapg.Properties.String, str, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        date: typing.Union[MetaOapg.Properties.Date, str, datetime.date, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        password: typing.Union[MetaOapg.Properties.Password, str, schemas.Unset] = schemas.unset,
-        callback: typing.Union[MetaOapg.Properties.Callback, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        byte: typing.Union[Schema_.Properties.Byte, str, ],
+        double: typing.Union[Schema_.Properties.Double, decimal.Decimal, int, float, ],
+        number: typing.Union[Schema_.Properties.Number, decimal.Decimal, int, float, ],
+        pattern_without_delimiter: typing.Union[Schema_.Properties.PatternWithoutDelimiter, str, ],
+        integer: typing.Union[Schema_.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        string: typing.Union[Schema_.Properties.String, str, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        date: typing.Union[Schema_.Properties.Date, str, datetime.date, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        password: typing.Union[Schema_.Properties.Password, str, schemas.Unset] = schemas.unset,
+        callback: typing.Union[Schema_.Properties.Callback, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             byte=byte,
             double=double,
             number=number,
@@ -349,6 +349,6 @@ def __new__(
             dateTime=dateTime,
             password=password,
             callback=callback,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.pyi
index 1868c597476..c487fd8fdd5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake/post/request_body/application_x_www_form_urlencoded.pyi
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "byte",
             "double",
@@ -108,52 +108,52 @@ class ApplicationXWwwFormUrlencoded(
                 "callback": Callback,
             }
     
-    byte: MetaOapg.Properties.Byte
-    double: MetaOapg.Properties.Double
-    number: MetaOapg.Properties.Number
-    pattern_without_delimiter: MetaOapg.Properties.PatternWithoutDelimiter
+    byte: Schema_.Properties.Byte
+    double: Schema_.Properties.Double
+    number: Schema_.Properties.Number
+    pattern_without_delimiter: Schema_.Properties.PatternWithoutDelimiter
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def __getitem__(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def __getitem__(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def __getitem__(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.Properties.PatternWithoutDelimiter: ...
+    def __getitem__(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> Schema_.Properties.PatternWithoutDelimiter: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> MetaOapg.Properties.Integer: ...
+    def __getitem__(self, name: typing_extensions.Literal["integer"]) -> Schema_.Properties.Integer: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> MetaOapg.Properties.Int32: ...
+    def __getitem__(self, name: typing_extensions.Literal["int32"]) -> Schema_.Properties.Int32: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> MetaOapg.Properties.Int64: ...
+    def __getitem__(self, name: typing_extensions.Literal["int64"]) -> Schema_.Properties.Int64: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["float"]) -> MetaOapg.Properties._Float: ...
+    def __getitem__(self, name: typing_extensions.Literal["float"]) -> Schema_.Properties._Float: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["string"]) -> MetaOapg.Properties.String: ...
+    def __getitem__(self, name: typing_extensions.Literal["string"]) -> Schema_.Properties.String: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> MetaOapg.Properties.Binary: ...
+    def __getitem__(self, name: typing_extensions.Literal["binary"]) -> Schema_.Properties.Binary: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["date"]) -> MetaOapg.Properties.Date: ...
+    def __getitem__(self, name: typing_extensions.Literal["date"]) -> Schema_.Properties.Date: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> MetaOapg.Properties.DateTime: ...
+    def __getitem__(self, name: typing_extensions.Literal["dateTime"]) -> Schema_.Properties.DateTime: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["password"]) -> MetaOapg.Properties.Password: ...
+    def __getitem__(self, name: typing_extensions.Literal["password"]) -> Schema_.Properties.Password: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> MetaOapg.Properties.Callback: ...
+    def __getitem__(self, name: typing_extensions.Literal["callback"]) -> Schema_.Properties.Callback: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -182,51 +182,51 @@ class ApplicationXWwwFormUrlencoded(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["byte"]) -> MetaOapg.Properties.Byte: ...
+    def get_item_(self, name: typing_extensions.Literal["byte"]) -> Schema_.Properties.Byte: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["double"]) -> MetaOapg.Properties.Double: ...
+    def get_item_(self, name: typing_extensions.Literal["double"]) -> Schema_.Properties.Double: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["number"]) -> MetaOapg.Properties.Number: ...
+    def get_item_(self, name: typing_extensions.Literal["number"]) -> Schema_.Properties.Number: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> MetaOapg.Properties.PatternWithoutDelimiter: ...
+    def get_item_(self, name: typing_extensions.Literal["pattern_without_delimiter"]) -> Schema_.Properties.PatternWithoutDelimiter: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["integer"]) -> typing.Union[MetaOapg.Properties.Integer, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["integer"]) -> typing.Union[Schema_.Properties.Integer, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int32"]) -> typing.Union[MetaOapg.Properties.Int32, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int32"]) -> typing.Union[Schema_.Properties.Int32, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["int64"]) -> typing.Union[MetaOapg.Properties.Int64, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["int64"]) -> typing.Union[Schema_.Properties.Int64, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["float"]) -> typing.Union[MetaOapg.Properties._Float, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["float"]) -> typing.Union[Schema_.Properties._Float, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union[MetaOapg.Properties.String, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union[Schema_.Properties.String, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["binary"]) -> typing.Union[MetaOapg.Properties.Binary, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["binary"]) -> typing.Union[Schema_.Properties.Binary, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["date"]) -> typing.Union[MetaOapg.Properties.Date, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["date"]) -> typing.Union[Schema_.Properties.Date, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[MetaOapg.Properties.DateTime, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["dateTime"]) -> typing.Union[Schema_.Properties.DateTime, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["password"]) -> typing.Union[MetaOapg.Properties.Password, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["password"]) -> typing.Union[Schema_.Properties.Password, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["callback"]) -> typing.Union[MetaOapg.Properties.Callback, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["callback"]) -> typing.Union[Schema_.Properties.Callback, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["byte"],
@@ -246,30 +246,30 @@ class ApplicationXWwwFormUrlencoded(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        byte: typing.Union[MetaOapg.Properties.Byte, str, ],
-        double: typing.Union[MetaOapg.Properties.Double, decimal.Decimal, int, float, ],
-        number: typing.Union[MetaOapg.Properties.Number, decimal.Decimal, int, float, ],
-        pattern_without_delimiter: typing.Union[MetaOapg.Properties.PatternWithoutDelimiter, str, ],
-        integer: typing.Union[MetaOapg.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int32: typing.Union[MetaOapg.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        int64: typing.Union[MetaOapg.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
-        string: typing.Union[MetaOapg.Properties.String, str, schemas.Unset] = schemas.unset,
-        binary: typing.Union[MetaOapg.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        date: typing.Union[MetaOapg.Properties.Date, str, datetime.date, schemas.Unset] = schemas.unset,
-        dateTime: typing.Union[MetaOapg.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
-        password: typing.Union[MetaOapg.Properties.Password, str, schemas.Unset] = schemas.unset,
-        callback: typing.Union[MetaOapg.Properties.Callback, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        byte: typing.Union[Schema_.Properties.Byte, str, ],
+        double: typing.Union[Schema_.Properties.Double, decimal.Decimal, int, float, ],
+        number: typing.Union[Schema_.Properties.Number, decimal.Decimal, int, float, ],
+        pattern_without_delimiter: typing.Union[Schema_.Properties.PatternWithoutDelimiter, str, ],
+        integer: typing.Union[Schema_.Properties.Integer, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int32: typing.Union[Schema_.Properties.Int32, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        int64: typing.Union[Schema_.Properties.Int64, decimal.Decimal, int, schemas.Unset] = schemas.unset,
+        string: typing.Union[Schema_.Properties.String, str, schemas.Unset] = schemas.unset,
+        binary: typing.Union[Schema_.Properties.Binary, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        date: typing.Union[Schema_.Properties.Date, str, datetime.date, schemas.Unset] = schemas.unset,
+        dateTime: typing.Union[Schema_.Properties.DateTime, str, datetime.datetime, schemas.Unset] = schemas.unset,
+        password: typing.Union[Schema_.Properties.Password, str, schemas.Unset] = schemas.unset,
+        callback: typing.Union[Schema_.Properties.Callback, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             byte=byte,
             double=double,
             number=number,
@@ -283,6 +283,6 @@ class ApplicationXWwwFormUrlencoded(
             dateTime=dateTime,
             password=password,
             callback=callback,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.py
index 640e6b4b909..39d46d94c8d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _additional_properties_with_array_of_enums_oapg(
     ]: ...
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _additional_properties_with_array_of_enums_oapg(
 
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _additional_properties_with_array_of_enums_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _additional_properties_with_array_of_enums_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -226,7 +226,7 @@ def additional_properties_with_array_of_enums(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._additional_properties_with_array_of_enums_oapg(
+        return self._additional_properties_with_array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -300,7 +300,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._additional_properties_with_array_of_enums_oapg(
+        return self._additional_properties_with_array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.pyi
index 6cb24350a4c..277c05abeaf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_additional_properties_with_array_of_enums/get/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _additional_properties_with_array_of_enums_oapg(
+    def _additional_properties_with_array_of_enums(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.additional_properties_with_array_of_enums.AdditionalPropertiesWithArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -214,7 +214,7 @@ class AdditionalPropertiesWithArrayOfEnums(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._additional_properties_with_array_of_enums_oapg(
+        return self._additional_properties_with_array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -288,7 +288,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._additional_properties_with_array_of_enums_oapg(
+        return self._additional_properties_with_array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.py
index defa6e09403..299ccf87417 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _body_with_file_schema_oapg(
     ]: ...
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _body_with_file_schema_oapg(
 
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _body_with_file_schema_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _body_with_file_schema_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = 'application/json',
@@ -211,7 +211,7 @@ def body_with_file_schema(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_file_schema_oapg(
+        return self._body_with_file_schema(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -279,7 +279,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_file_schema_oapg(
+        return self._body_with_file_schema(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.pyi
index b6cbddc3b1e..2c8de62e332 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_file_schema/put/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _body_with_file_schema_oapg(
+    def _body_with_file_schema(
         self,
         body: typing.Union[request_body.file_schema_test_class.FileSchemaTestClass,],
         content_type: str = 'application/json',
@@ -199,7 +199,7 @@ class BodyWithFileSchema(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_file_schema_oapg(
+        return self._body_with_file_schema(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -267,7 +267,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_file_schema_oapg(
+        return self._body_with_file_schema(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.py
index 2919462b0c9..8b4e3ef5af6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.py
@@ -68,7 +68,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -81,7 +81,7 @@ def _body_with_query_params_oapg(
     ]: ...
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -95,7 +95,7 @@ def _body_with_query_params_oapg(
 
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -106,7 +106,7 @@ def _body_with_query_params_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -119,7 +119,7 @@ def _body_with_query_params_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -133,7 +133,7 @@ def _body_with_query_params_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -257,7 +257,7 @@ def body_with_query_params(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_query_params_oapg(
+        return self._body_with_query_params(
             body=body,
             query_params=query_params,
             content_type=content_type,
@@ -331,7 +331,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_query_params_oapg(
+        return self._body_with_query_params(
             body=body,
             query_params=query_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.pyi
index 0ff847a6288..3edf4ab7e08 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_body_with_query_params/put/__init__.pyi
@@ -56,7 +56,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -69,7 +69,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -83,7 +83,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -94,7 +94,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -107,7 +107,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _body_with_query_params_oapg(
+    def _body_with_query_params(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -121,7 +121,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -245,7 +245,7 @@ class BodyWithQueryParams(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_query_params_oapg(
+        return self._body_with_query_params(
             body=body,
             query_params=query_params,
             content_type=content_type,
@@ -319,7 +319,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._body_with_query_params_oapg(
+        return self._body_with_query_params(
             body=body,
             query_params=query_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.py
index 56a85177238..50cff75215f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.py
@@ -72,7 +72,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -83,7 +83,7 @@ def _case_sensitive_params_oapg(
     ]: ...
 
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -92,7 +92,7 @@ def _case_sensitive_params_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -103,7 +103,7 @@ def _case_sensitive_params_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -115,7 +115,7 @@ def _case_sensitive_params_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -201,7 +201,7 @@ def case_sensitive_params(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._case_sensitive_params_oapg(
+        return self._case_sensitive_params(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -251,7 +251,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._case_sensitive_params_oapg(
+        return self._case_sensitive_params(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.pyi
index 850cf0cdd53..ad12ce2ea55 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_case_sensitive_params/put/__init__.pyi
@@ -60,7 +60,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -71,7 +71,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -80,7 +80,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -91,7 +91,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _case_sensitive_params_oapg(
+    def _case_sensitive_params(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -103,7 +103,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -189,7 +189,7 @@ class CaseSensitiveParams(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._case_sensitive_params_oapg(
+        return self._case_sensitive_params(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -239,7 +239,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._case_sensitive_params_oapg(
+        return self._case_sensitive_params(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.py
index 87fef812a5b..7269deef16a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.py
@@ -51,7 +51,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -64,7 +64,7 @@ def _classname_oapg(
     ]: ...
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -78,7 +78,7 @@ def _classname_oapg(
 
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -89,7 +89,7 @@ def _classname_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -102,7 +102,7 @@ def _classname_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -233,7 +233,7 @@ def classname(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._classname_oapg(
+        return self._classname(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -307,7 +307,7 @@ def patch(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._classname_oapg(
+        return self._classname(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.pyi
index ce7fbef147c..305b37da487 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_classname_test/patch/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = ...,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _classname_oapg(
+    def _classname(
         self,
         body: typing.Union[request_body.client.Client,],
         content_type: str = 'application/json',
@@ -217,7 +217,7 @@ class Classname(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._classname_oapg(
+        return self._classname(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -291,7 +291,7 @@ class ApiForpatch(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._classname_oapg(
+        return self._classname(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.py
index f9c97dfea0b..6530c32a92d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.py
@@ -68,7 +68,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -80,7 +80,7 @@ def _delete_coffee_oapg(
     ]: ...
 
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -89,7 +89,7 @@ def _delete_coffee_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -101,7 +101,7 @@ def _delete_coffee_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -114,7 +114,7 @@ def _delete_coffee_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -202,7 +202,7 @@ def delete_coffee(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_coffee_oapg(
+        return self._delete_coffee(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -254,7 +254,7 @@ def delete(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_coffee_oapg(
+        return self._delete_coffee(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.pyi
index a8c5cedb9e4..e66da507cd3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_delete_coffee_id/delete/__init__.pyi
@@ -55,7 +55,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -76,7 +76,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_coffee_oapg(
+    def _delete_coffee(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -101,7 +101,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -189,7 +189,7 @@ class DeleteCoffee(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_coffee_oapg(
+        return self._delete_coffee(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -241,7 +241,7 @@ class ApiFordelete(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_coffee_oapg(
+        return self._delete_coffee(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.py
index 2ffa7ef48eb..873f0ff9fad 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.py
@@ -46,7 +46,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -57,7 +57,7 @@ def _fake_health_get_oapg(
     ]: ...
 
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -66,7 +66,7 @@ def _fake_health_get_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -77,7 +77,7 @@ def _fake_health_get_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -170,7 +170,7 @@ def fake_health_get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._fake_health_get_oapg(
+        return self._fake_health_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -220,7 +220,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._fake_health_get_oapg(
+        return self._fake_health_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.pyi
index 7863e4634d9..0d8cf17838c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_health/get/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _fake_health_get_oapg(
+    def _fake_health_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -158,7 +158,7 @@ class FakeHealthGet(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._fake_health_get_oapg(
+        return self._fake_health_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -208,7 +208,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._fake_health_get_oapg(
+        return self._fake_health_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.py
index ada8a80bd31..870bebd402c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -56,7 +56,7 @@ def _inline_additional_properties_oapg(
     ]: ...
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = ...,
@@ -69,7 +69,7 @@ def _inline_additional_properties_oapg(
 
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -79,7 +79,7 @@ def _inline_additional_properties_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = ...,
@@ -91,7 +91,7 @@ def _inline_additional_properties_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = 'application/json',
@@ -212,7 +212,7 @@ def inline_additional_properties(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_additional_properties_oapg(
+        return self._inline_additional_properties(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -280,7 +280,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_additional_properties_oapg(
+        return self._inline_additional_properties(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.pyi
index cacf32ce7aa..6c9a94a679d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _inline_additional_properties_oapg(
+    def _inline_additional_properties(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,dict, frozendict.frozendict, ],
         content_type: str = 'application/json',
@@ -200,7 +200,7 @@ class InlineAdditionalProperties(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_additional_properties_oapg(
+        return self._inline_additional_properties(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -268,7 +268,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_additional_properties_oapg(
+        return self._inline_additional_properties(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.py
index 1a1ecbc961d..a12857176d6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.py
@@ -28,26 +28,26 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         AdditionalProperties = schemas.StrSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.pyi
index 6f41da900d4..de7258fe620 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_additional_properties/post/request_body/application_json.pyi
@@ -28,25 +28,25 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         AdditionalProperties = schemas.StrSchema
     
-    def __getitem__(self, name: str) -> MetaOapg.AdditionalProperties:
+    def __getitem__(self, name: str) -> Schema_.AdditionalProperties:
         # dict_instance[name] accessor
         return super().__getitem__(name)
     
-    def get_item_oapg(self, name: str) -> MetaOapg.AdditionalProperties:
-        return super().get_item_oapg(name)
+    def get_item_(self, name: str) -> Schema_.AdditionalProperties:
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
-        **kwargs: typing.Union[MetaOapg.AdditionalProperties, str, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
+        **kwargs: typing.Union[Schema_.AdditionalProperties, str, ],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.py
index bba3c67f68b..94ca70efbcb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.py
@@ -75,7 +75,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -89,7 +89,7 @@ def _inline_composition_oapg(
     ]: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"],
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -103,7 +103,7 @@ def _inline_composition_oapg(
     ]: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -118,7 +118,7 @@ def _inline_composition_oapg(
 
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -130,7 +130,7 @@ def _inline_composition_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -144,7 +144,7 @@ def _inline_composition_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -160,7 +160,7 @@ def _inline_composition_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -304,7 +304,7 @@ def inline_composition(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_composition_oapg(
+        return self._inline_composition(
             body=body,
             query_params=query_params,
             content_type=content_type,
@@ -398,7 +398,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_composition_oapg(
+        return self._inline_composition(
             body=body,
             query_params=query_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.pyi
index 9b89e0d6f27..e6cc3388a17 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/__init__.pyi
@@ -63,7 +63,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -77,7 +77,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"],
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -91,7 +91,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -106,7 +106,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -118,7 +118,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -132,7 +132,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _inline_composition_oapg(
+    def _inline_composition(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -148,7 +148,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -292,7 +292,7 @@ class InlineComposition(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_composition_oapg(
+        return self._inline_composition(
             body=body,
             query_params=query_params,
             content_type=content_type,
@@ -386,7 +386,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._inline_composition_oapg(
+        return self._inline_composition(
             body=body,
             query_params=query_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.py
index 92386ccbb3d..91bf39486a1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -39,7 +39,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -51,13 +51,13 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.pyi
index 5b2eb9bd71e..3cdf9aba9e0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_0/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -45,13 +45,13 @@ class Schema(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.py
index 1576a1d96f5..cd4d06a8140 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -39,7 +39,7 @@ class SomeProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -50,7 +50,7 @@ class AllOf0(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -62,14 +62,14 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -77,7 +77,7 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -93,31 +93,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.pyi
index 52575f1de84..2181e3ed4f2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/parameter_1/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -38,7 +38,7 @@ class Schema(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -55,14 +55,14 @@ class Schema(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -70,7 +70,7 @@ class Schema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -86,31 +86,31 @@ class Schema(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.py
index 7fd4fc47124..b69922e9ceb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -39,7 +39,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -51,13 +51,13 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.pyi
index 07de20480d6..7f59784b35c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -45,13 +45,13 @@ class ApplicationJson(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.py
index f00a59c4eee..25f56078c12 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -39,7 +39,7 @@ class SomeProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -50,7 +50,7 @@ class AllOf0(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -62,14 +62,14 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -77,7 +77,7 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -93,31 +93,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.pyi
index 78022db420a..44ab5119589 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/request_body/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -38,7 +38,7 @@ class MultipartFormData(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -55,14 +55,14 @@ class MultipartFormData(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -70,7 +70,7 @@ class MultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -86,31 +86,31 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.py
index 7fd4fc47124..b69922e9ceb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -39,7 +39,7 @@ class AllOf0(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {
                         str,
                     }
@@ -51,13 +51,13 @@ class MetaOapg:
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.pyi
index 07de20480d6..7f59784b35c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         # any type
         
         class AllOf:
@@ -45,13 +45,13 @@ class ApplicationJson(
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.py
index f00a59c4eee..25f56078c12 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -39,7 +39,7 @@ class SomeProp(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -50,7 +50,7 @@ class AllOf0(
                         ):
                         
                         
-                            class MetaOapg:
+                            class Schema_:
                                 types = {
                                     str,
                                 }
@@ -62,14 +62,14 @@ class MetaOapg:
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -77,7 +77,7 @@ def __new__(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -93,31 +93,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.pyi
index 78022db420a..44ab5119589 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_inline_composition/post/response_for_200/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -38,7 +38,7 @@ class MultipartFormData(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     # any type
                     
                     class AllOf:
@@ -55,14 +55,14 @@ class MultipartFormData(
             
                 def __new__(
                     cls,
-                    *_args: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    *args_: typing.Union[dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                     **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
                 ) -> 'SomeProp':
                     return super().__new__(
                         cls,
-                        *_args,
-                        _configuration=_configuration,
+                        *args_,
+                        configuration_=configuration_,
                         **kwargs,
                     )
             __annotations__ = {
@@ -70,7 +70,7 @@ class MultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> MetaOapg.Properties.SomeProp: ...
+    def __getitem__(self, name: typing_extensions.Literal["someProp"]) -> Schema_.Properties.SomeProp: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -86,31 +86,31 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[MetaOapg.Properties.SomeProp, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["someProp"]) -> typing.Union[Schema_.Properties.SomeProp, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["someProp"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        someProp: typing.Union[MetaOapg.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        someProp: typing.Union[Schema_.Properties.SomeProp, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             someProp=someProp,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.py
index fdb15328a06..96c030cc467 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -56,7 +56,7 @@ def _json_form_data_oapg(
     ]: ...
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -69,7 +69,7 @@ def _json_form_data_oapg(
 
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -79,7 +79,7 @@ def _json_form_data_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -91,7 +91,7 @@ def _json_form_data_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -210,7 +210,7 @@ def json_form_data(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_form_data_oapg(
+        return self._json_form_data(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -278,7 +278,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_form_data_oapg(
+        return self._json_form_data(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.pyi
index 511d9c82009..9653ebc0dd0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_form_data_oapg(
+    def _json_form_data(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -198,7 +198,7 @@ class JsonFormData(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_form_data_oapg(
+        return self._json_form_data(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -266,7 +266,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_form_data_oapg(
+        return self._json_form_data(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.py
index aacb8104745..67b2fd0bf2d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.py
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "param",
@@ -43,14 +43,14 @@ class Properties:
                 "param2": Param2,
             }
     
-    param: MetaOapg.Properties.Param
-    param2: MetaOapg.Properties.Param2
+    param: Schema_.Properties.Param
+    param2: Schema_.Properties.Param2
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["param"]) -> MetaOapg.Properties.Param: ...
+    def __getitem__(self, name: typing_extensions.Literal["param"]) -> Schema_.Properties.Param: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.Properties.Param2: ...
+    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> Schema_.Properties.Param2: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -67,15 +67,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["param"]) -> MetaOapg.Properties.Param: ...
+    def get_item_(self, name: typing_extensions.Literal["param"]) -> Schema_.Properties.Param: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.Properties.Param2: ...
+    def get_item_(self, name: typing_extensions.Literal["param2"]) -> Schema_.Properties.Param2: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["param"],
@@ -83,21 +83,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        param: typing.Union[MetaOapg.Properties.Param, str, ],
-        param2: typing.Union[MetaOapg.Properties.Param2, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        param: typing.Union[Schema_.Properties.Param, str, ],
+        param2: typing.Union[Schema_.Properties.Param2, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             param=param,
             param2=param2,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.pyi
index bcb4fbe3b5c..67ecfdbf678 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_form_data/get/request_body/application_x_www_form_urlencoded.pyi
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "param",
             "param2",
@@ -42,14 +42,14 @@ class ApplicationXWwwFormUrlencoded(
                 "param2": Param2,
             }
     
-    param: MetaOapg.Properties.Param
-    param2: MetaOapg.Properties.Param2
+    param: Schema_.Properties.Param
+    param2: Schema_.Properties.Param2
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["param"]) -> MetaOapg.Properties.Param: ...
+    def __getitem__(self, name: typing_extensions.Literal["param"]) -> Schema_.Properties.Param: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.Properties.Param2: ...
+    def __getitem__(self, name: typing_extensions.Literal["param2"]) -> Schema_.Properties.Param2: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -66,15 +66,15 @@ class ApplicationXWwwFormUrlencoded(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["param"]) -> MetaOapg.Properties.Param: ...
+    def get_item_(self, name: typing_extensions.Literal["param"]) -> Schema_.Properties.Param: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["param2"]) -> MetaOapg.Properties.Param2: ...
+    def get_item_(self, name: typing_extensions.Literal["param2"]) -> Schema_.Properties.Param2: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["param"],
@@ -82,21 +82,21 @@ class ApplicationXWwwFormUrlencoded(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        param: typing.Union[MetaOapg.Properties.Param, str, ],
-        param2: typing.Union[MetaOapg.Properties.Param2, str, ],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        param: typing.Union[Schema_.Properties.Param, str, ],
+        param2: typing.Union[Schema_.Properties.Param2, str, ],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             param=param,
             param2=param2,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.py
index 086b8229e22..f072ed12fcd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.py
@@ -44,7 +44,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: typing_extensions.Literal["application/json-patch+json"] = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -56,7 +56,7 @@ def _json_patch_oapg(
     ]: ...
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -69,7 +69,7 @@ def _json_patch_oapg(
 
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -79,7 +79,7 @@ def _json_patch_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -91,7 +91,7 @@ def _json_patch_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = 'application/json-patch+json',
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -210,7 +210,7 @@ def json_patch(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_patch_oapg(
+        return self._json_patch(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -278,7 +278,7 @@ def patch(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_patch_oapg(
+        return self._json_patch(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.pyi
index 91283fd26f8..f8968372fb4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_patch/patch/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: typing_extensions.Literal["application/json-patch+json"] = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_patch_oapg(
+    def _json_patch(
         self,
         content_type: str = 'application/json-patch+json',
         body: typing.Union[request_body.json_patch_request.JSONPatchRequest, schemas.Unset] = schemas.unset,
@@ -198,7 +198,7 @@ class JsonPatch(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_patch_oapg(
+        return self._json_patch(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -266,7 +266,7 @@ class ApiForpatch(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_patch_oapg(
+        return self._json_patch(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.py
index 2b0f81ad387..db3f5b685ac 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: typing_extensions.Literal["application/json; charset=utf-8"] = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _json_with_charset_oapg(
     ]: ...
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _json_with_charset_oapg(
 
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _json_with_charset_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _json_with_charset_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = 'application/json; charset=utf-8',
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -226,7 +226,7 @@ def json_with_charset(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_with_charset_oapg(
+        return self._json_with_charset(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -300,7 +300,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_with_charset_oapg(
+        return self._json_with_charset(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.pyi
index 756279dc75c..0bd9a62090d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_json_with_charset/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: typing_extensions.Literal["application/json; charset=utf-8"] = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _json_with_charset_oapg(
+    def _json_with_charset(
         self,
         content_type: str = 'application/json; charset=utf-8',
         body: typing.Union[request_body.application_json_charsetutf8.ApplicationJsonCharsetutf8, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -214,7 +214,7 @@ class JsonWithCharset(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_with_charset_oapg(
+        return self._json_with_charset(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -288,7 +288,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._json_with_charset_oapg(
+        return self._json_with_charset(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.py
index 0cae82815d0..0d5a8827d3e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.py
@@ -66,7 +66,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -77,7 +77,7 @@ def _object_in_query_oapg(
     ]: ...
 
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -86,7 +86,7 @@ def _object_in_query_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -97,7 +97,7 @@ def _object_in_query_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -110,7 +110,7 @@ def _object_in_query_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -196,7 +196,7 @@ def object_in_query(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_in_query_oapg(
+        return self._object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -246,7 +246,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_in_query_oapg(
+        return self._object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.pyi
index 807fcebefe4..f48be24106b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/__init__.pyi
@@ -54,7 +54,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -74,7 +74,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -85,7 +85,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _object_in_query_oapg(
+    def _object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -98,7 +98,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -184,7 +184,7 @@ class ObjectInQuery(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_in_query_oapg(
+        return self._object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -234,7 +234,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_in_query_oapg(
+        return self._object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.py
index 3a306b7356e..0234222bab7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -38,7 +38,7 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> MetaOapg.Properties.Keyword: ...
+    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> Schema_.Properties.Keyword: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -54,31 +54,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[MetaOapg.Properties.Keyword, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[Schema_.Properties.Keyword, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["keyword"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        keyword: typing.Union[MetaOapg.Properties.Keyword, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        keyword: typing.Union[Schema_.Properties.Keyword, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             keyword=keyword,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.pyi
index 6dc34d8f08f..88373823209 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_obj_in_query/get/parameter_0/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Keyword = schemas.StrSchema
@@ -37,7 +37,7 @@ class Schema(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> MetaOapg.Properties.Keyword: ...
+    def __getitem__(self, name: typing_extensions.Literal["keyword"]) -> Schema_.Properties.Keyword: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -53,31 +53,31 @@ class Schema(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[MetaOapg.Properties.Keyword, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["keyword"]) -> typing.Union[Schema_.Properties.Keyword, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["keyword"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        keyword: typing.Union[MetaOapg.Properties.Keyword, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        keyword: typing.Union[Schema_.Properties.Keyword, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'Schema':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             keyword=keyword,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.py
index 0e47e7bb04e..43c99f752a3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.py
@@ -188,7 +188,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -205,7 +205,7 @@ def _parameter_collisions_oapg(
     ]: ...
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -223,7 +223,7 @@ def _parameter_collisions_oapg(
 
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -238,7 +238,7 @@ def _parameter_collisions_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -255,7 +255,7 @@ def _parameter_collisions_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -274,10 +274,10 @@ def _parameter_collisions_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
-        self._verify_typed_dict_inputs_oapg(RequestCookieParameters.Params, cookie_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestCookieParameters.Params, cookie_params)
         used_path = path
 
         _path_params = {}
@@ -439,7 +439,7 @@ def parameter_collisions(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._parameter_collisions_oapg(
+        return self._parameter_collisions(
             body=body,
             query_params=query_params,
             header_params=header_params,
@@ -537,7 +537,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._parameter_collisions_oapg(
+        return self._parameter_collisions(
             body=body,
             query_params=query_params,
             header_params=header_params,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.pyi
index bdb9c455ddb..1b177619492 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_parameter_collisions1_abab_self_ab/post/__init__.pyi
@@ -176,7 +176,7 @@ class RequestCookieParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -193,7 +193,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -211,7 +211,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -226,7 +226,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -243,7 +243,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _parameter_collisions_oapg(
+    def _parameter_collisions(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.application_json.ApplicationJson, dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
@@ -262,10 +262,10 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
-        self._verify_typed_dict_inputs_oapg(RequestCookieParameters.Params, cookie_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestCookieParameters.Params, cookie_params)
         used_path = path
 
         _path_params = {}
@@ -427,7 +427,7 @@ class ParameterCollisions(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._parameter_collisions_oapg(
+        return self._parameter_collisions(
             body=body,
             query_params=query_params,
             header_params=header_params,
@@ -525,7 +525,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._parameter_collisions_oapg(
+        return self._parameter_collisions(
             body=body,
             query_params=query_params,
             header_params=header_params,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.py
index e21a048753f..79a386d0ed8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.py
@@ -75,7 +75,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -89,7 +89,7 @@ def _upload_file_with_required_file_oapg(
     ]: ...
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -104,7 +104,7 @@ def _upload_file_with_required_file_oapg(
 
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -116,7 +116,7 @@ def _upload_file_with_required_file_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -130,7 +130,7 @@ def _upload_file_with_required_file_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -146,7 +146,7 @@ def _upload_file_with_required_file_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -277,7 +277,7 @@ def upload_file_with_required_file(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_with_required_file_oapg(
+        return self._upload_file_with_required_file(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -357,7 +357,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_with_required_file_oapg(
+        return self._upload_file_with_required_file(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.pyi
index 36368f65248..5a1733e838d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/__init__.pyi
@@ -59,7 +59,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -100,7 +100,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -114,7 +114,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_file_with_required_file_oapg(
+    def _upload_file_with_required_file(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -130,7 +130,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -261,7 +261,7 @@ class UploadFileWithRequiredFile(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_with_required_file_oapg(
+        return self._upload_file_with_required_file(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -341,7 +341,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_with_required_file_oapg(
+        return self._upload_file_with_required_file(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.py
index 840ae3d999b..bb842f7b97a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "requiredFile",
@@ -42,13 +42,13 @@ class Properties:
                 "requiredFile": RequiredFile,
             }
     
-    requiredFile: MetaOapg.Properties.RequiredFile
+    requiredFile: Schema_.Properties.RequiredFile
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.Properties.RequiredFile: ...
+    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> Schema_.Properties.RequiredFile: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.Properties.RequiredFile: ...
+    def get_item_(self, name: typing_extensions.Literal["requiredFile"]) -> Schema_.Properties.RequiredFile: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["requiredFile"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        requiredFile: typing.Union[MetaOapg.Properties.RequiredFile, bytes, io.FileIO, io.BufferedReader, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        requiredFile: typing.Union[Schema_.Properties.RequiredFile, bytes, io.FileIO, io.BufferedReader, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.pyi
index 584b5ab459b..f28a183a259 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_pet_id_upload_image_with_required_file/post/request_body/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "requiredFile",
         }
@@ -41,13 +41,13 @@ class MultipartFormData(
                 "requiredFile": RequiredFile,
             }
     
-    requiredFile: MetaOapg.Properties.RequiredFile
+    requiredFile: Schema_.Properties.RequiredFile
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.Properties.RequiredFile: ...
+    def __getitem__(self, name: typing_extensions.Literal["requiredFile"]) -> Schema_.Properties.RequiredFile: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["requiredFile"]) -> MetaOapg.Properties.RequiredFile: ...
+    def get_item_(self, name: typing_extensions.Literal["requiredFile"]) -> Schema_.Properties.RequiredFile: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["requiredFile"],
@@ -80,21 +80,21 @@ class MultipartFormData(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        requiredFile: typing.Union[MetaOapg.Properties.RequiredFile, bytes, io.FileIO, io.BufferedReader, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        requiredFile: typing.Union[Schema_.Properties.RequiredFile, bytes, io.FileIO, io.BufferedReader, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             requiredFile=requiredFile,
             additionalMetadata=additionalMetadata,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.py
index a33e9865d7c..dd52d70725b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.py
@@ -70,7 +70,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -82,7 +82,7 @@ def _query_param_with_json_content_type_oapg(
     ]: ...
 
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -92,7 +92,7 @@ def _query_param_with_json_content_type_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -104,7 +104,7 @@ def _query_param_with_json_content_type_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -118,7 +118,7 @@ def _query_param_with_json_content_type_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -214,7 +214,7 @@ def query_param_with_json_content_type(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_param_with_json_content_type_oapg(
+        return self._query_param_with_json_content_type(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -269,7 +269,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_param_with_json_content_type_oapg(
+        return self._query_param_with_json_content_type(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.pyi
index daa732810d5..c3d3757993e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_query_param_with_json_content_type/get/__init__.pyi
@@ -58,7 +58,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -70,7 +70,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -80,7 +80,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -92,7 +92,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _query_param_with_json_content_type_oapg(
+    def _query_param_with_json_content_type(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -106,7 +106,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -202,7 +202,7 @@ class QueryParamWithJsonContentType(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_param_with_json_content_type_oapg(
+        return self._query_param_with_json_content_type(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -257,7 +257,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_param_with_json_content_type_oapg(
+        return self._query_param_with_json_content_type(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.py
index e275f3fa0ad..2b040ca32f3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.py
@@ -66,7 +66,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -77,7 +77,7 @@ def _ref_object_in_query_oapg(
     ]: ...
 
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -86,7 +86,7 @@ def _ref_object_in_query_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -97,7 +97,7 @@ def _ref_object_in_query_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -110,7 +110,7 @@ def _ref_object_in_query_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -196,7 +196,7 @@ def ref_object_in_query(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._ref_object_in_query_oapg(
+        return self._ref_object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -246,7 +246,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._ref_object_in_query_oapg(
+        return self._ref_object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.pyi
index 1fd9171a539..e00d3a71d48 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_ref_obj_in_query/get/__init__.pyi
@@ -54,7 +54,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -74,7 +74,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -85,7 +85,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _ref_object_in_query_oapg(
+    def _ref_object_in_query(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -98,7 +98,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -184,7 +184,7 @@ class RefObjectInQuery(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._ref_object_in_query_oapg(
+        return self._ref_object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -234,7 +234,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._ref_object_in_query_oapg(
+        return self._ref_object_in_query(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.py
index cb331fd833b..bdb673fcb7b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _array_of_enums_oapg(
     ]: ...
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _array_of_enums_oapg(
 
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _array_of_enums_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _array_of_enums_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -226,7 +226,7 @@ def array_of_enums(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_of_enums_oapg(
+        return self._array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -300,7 +300,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_of_enums_oapg(
+        return self._array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.pyi
index 8e863e561b6..90f71bfef9f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_array_of_enums/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _array_of_enums_oapg(
+    def _array_of_enums(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.array_of_enums.ArrayOfEnums, schemas.Unset] = schemas.unset,
@@ -214,7 +214,7 @@ class ArrayOfEnums(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_of_enums_oapg(
+        return self._array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -288,7 +288,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_of_enums_oapg(
+        return self._array_of_enums(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.py
index cba7e9da71a..cfb22993b25 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _array_model_oapg(
     ]: ...
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _array_model_oapg(
 
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _array_model_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _array_model_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def array_model(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_model_oapg(
+        return self._array_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_model_oapg(
+        return self._array_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.pyi
index 56c97616cc9..59e37b1d9d5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_arraymodel/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _array_model_oapg(
+    def _array_model(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.animal_farm.AnimalFarm, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class ArrayModel(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_model_oapg(
+        return self._array_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._array_model_oapg(
+        return self._array_model(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.py
index a4f8760ed49..f510b82bfb6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _boolean_oapg(
     ]: ...
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _boolean_oapg(
 
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _boolean_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _boolean_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def boolean(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._boolean_oapg(
+        return self._boolean(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._boolean_oapg(
+        return self._boolean(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.pyi
index 4503df7d9bb..554584e7450 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_boolean/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _boolean_oapg(
+    def _boolean(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.boolean.Boolean, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class Boolean(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._boolean_oapg(
+        return self._boolean(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._boolean_oapg(
+        return self._boolean(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.py
index 898afe22dbf..9f7cb70589b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _composed_one_of_different_types_oapg(
     ]: ...
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _composed_one_of_different_types_oapg(
 
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _composed_one_of_different_types_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _composed_one_of_different_types_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def composed_one_of_different_types(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._composed_one_of_different_types_oapg(
+        return self._composed_one_of_different_types(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._composed_one_of_different_types_oapg(
+        return self._composed_one_of_different_types(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.pyi
index 5420aa591f0..92738774400 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_composed_one_of_number_with_validations/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _composed_one_of_different_types_oapg(
+    def _composed_one_of_different_types(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.composed_one_of_different_types.ComposedOneOfDifferentTypes, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class ComposedOneOfDifferentTypes(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._composed_one_of_different_types_oapg(
+        return self._composed_one_of_different_types(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._composed_one_of_different_types_oapg(
+        return self._composed_one_of_different_types(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.py
index 9a65fb807b1..7b97f5feb32 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _string_enum_oapg(
     ]: ...
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _string_enum_oapg(
 
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _string_enum_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _string_enum_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def string_enum(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_enum_oapg(
+        return self._string_enum(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_enum_oapg(
+        return self._string_enum(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.pyi
index 1c6faca1320..b975115b78c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_enum/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _string_enum_oapg(
+    def _string_enum(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.string_enum.StringEnum, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class StringEnum(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_enum_oapg(
+        return self._string_enum(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_enum_oapg(
+        return self._string_enum(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.py
index f2db57004e9..987790a3869 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -60,7 +60,7 @@ def _mammal_oapg(
     ]: ...
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = ...,
@@ -74,7 +74,7 @@ def _mammal_oapg(
 
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -85,7 +85,7 @@ def _mammal_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = ...,
@@ -98,7 +98,7 @@ def _mammal_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = 'application/json',
@@ -227,7 +227,7 @@ def mammal(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._mammal_oapg(
+        return self._mammal(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -301,7 +301,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._mammal_oapg(
+        return self._mammal(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.pyi
index 908226a9c00..f485dc8967a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_mammal/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = ...,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = ...,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _mammal_oapg(
+    def _mammal(
         self,
         body: typing.Union[request_body.mammal.Mammal,],
         content_type: str = 'application/json',
@@ -215,7 +215,7 @@ class Mammal(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._mammal_oapg(
+        return self._mammal(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -289,7 +289,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._mammal_oapg(
+        return self._mammal(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.py
index 4bc6b2525ba..41510d29e6f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _number_with_validations_oapg(
     ]: ...
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _number_with_validations_oapg(
 
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _number_with_validations_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _number_with_validations_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def number_with_validations(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._number_with_validations_oapg(
+        return self._number_with_validations(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._number_with_validations_oapg(
+        return self._number_with_validations(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.pyi
index 5eb558b3069..f38ab50689d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_number/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _number_with_validations_oapg(
+    def _number_with_validations(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.number_with_validations.NumberWithValidations, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class NumberWithValidations(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._number_with_validations_oapg(
+        return self._number_with_validations(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._number_with_validations_oapg(
+        return self._number_with_validations(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.py
index 3b946e651da..f9d141f4f24 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _object_model_with_ref_props_oapg(
     ]: ...
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _object_model_with_ref_props_oapg(
 
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _object_model_with_ref_props_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _object_model_with_ref_props_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def object_model_with_ref_props(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_model_with_ref_props_oapg(
+        return self._object_model_with_ref_props(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_model_with_ref_props_oapg(
+        return self._object_model_with_ref_props(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.pyi
index 79bbee6a47a..ced6e7c2e2d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_object_model_with_ref_props/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _object_model_with_ref_props_oapg(
+    def _object_model_with_ref_props(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.object_model_with_ref_props.ObjectModelWithRefProps, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class ObjectModelWithRefProps(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_model_with_ref_props_oapg(
+        return self._object_model_with_ref_props(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._object_model_with_ref_props_oapg(
+        return self._object_model_with_ref_props(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.py
index 30bf481e83f..e78a46a30ca 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _string_oapg(
     ]: ...
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _string_oapg(
 
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _string_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _string_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -225,7 +225,7 @@ def string(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_oapg(
+        return self._string(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -299,7 +299,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_oapg(
+        return self._string(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.pyi
index dfb072e2202..e7be819ee99 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_refs_string/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: typing_extensions.Literal["application/json"] = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _string_oapg(
+    def _string(
         self,
         content_type: str = 'application/json',
         body: typing.Union[request_body.string.String, schemas.Unset] = schemas.unset,
@@ -213,7 +213,7 @@ class String(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_oapg(
+        return self._string(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -287,7 +287,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._string_oapg(
+        return self._string(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.py
index 7ba5c59c4ff..dacaed9c157 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -58,7 +58,7 @@ def _response_without_schema_oapg(
     ]: ...
 
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -67,7 +67,7 @@ def _response_without_schema_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -78,7 +78,7 @@ def _response_without_schema_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -171,7 +171,7 @@ def response_without_schema(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._response_without_schema_oapg(
+        return self._response_without_schema(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -221,7 +221,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._response_without_schema_oapg(
+        return self._response_without_schema(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.pyi
index 3e0872ec384..853762db044 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_response_without_schema/get/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -46,7 +46,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -55,7 +55,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -66,7 +66,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _response_without_schema_oapg(
+    def _response_without_schema(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -159,7 +159,7 @@ class ResponseWithoutSchema(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._response_without_schema_oapg(
+        return self._response_without_schema(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -209,7 +209,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._response_without_schema_oapg(
+        return self._response_without_schema(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.py
index 057b9f8ad6d..54f2c5b0be5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.py
@@ -81,7 +81,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -92,7 +92,7 @@ def _query_parameter_collection_format_oapg(
     ]: ...
 
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -101,7 +101,7 @@ def _query_parameter_collection_format_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -112,7 +112,7 @@ def _query_parameter_collection_format_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -124,7 +124,7 @@ def _query_parameter_collection_format_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -210,7 +210,7 @@ def query_parameter_collection_format(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_parameter_collection_format_oapg(
+        return self._query_parameter_collection_format(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -260,7 +260,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_parameter_collection_format_oapg(
+        return self._query_parameter_collection_format(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.pyi
index 3bc91f57b1f..3261516a5de 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/__init__.pyi
@@ -69,7 +69,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -80,7 +80,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -89,7 +89,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -100,7 +100,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _query_parameter_collection_format_oapg(
+    def _query_parameter_collection_format(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -112,7 +112,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -198,7 +198,7 @@ class QueryParameterCollectionFormat(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_parameter_collection_format_oapg(
+        return self._query_parameter_collection_format(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
@@ -248,7 +248,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._query_parameter_collection_format_oapg(
+        return self._query_parameter_collection_format(
             query_params=query_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_0/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_1/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_2/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_3/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_test_query_paramters/put/parameter_4/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.py
index 0af73cf2c5f..9d8c8429927 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: typing_extensions.Literal["application/octet-stream"] = ...,
@@ -60,7 +60,7 @@ def _upload_download_file_oapg(
     ]: ...
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = ...,
@@ -74,7 +74,7 @@ def _upload_download_file_oapg(
 
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -85,7 +85,7 @@ def _upload_download_file_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = ...,
@@ -98,7 +98,7 @@ def _upload_download_file_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = 'application/octet-stream',
@@ -228,7 +228,7 @@ def upload_download_file(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_download_file_oapg(
+        return self._upload_download_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -302,7 +302,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_download_file_oapg(
+        return self._upload_download_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.pyi
index 6446d083dc8..37d198432d3 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_download_file/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: typing_extensions.Literal["application/octet-stream"] = ...,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = ...,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = ...,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_download_file_oapg(
+    def _upload_download_file(
         self,
         body: typing.Union[request_body.application_octet_stream.ApplicationOctetStream,bytes, io.FileIO, io.BufferedReader, ],
         content_type: str = 'application/octet-stream',
@@ -216,7 +216,7 @@ class UploadDownloadFile(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_download_file_oapg(
+        return self._upload_download_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -290,7 +290,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_download_file_oapg(
+        return self._upload_download_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.py
index 5bddc0eebef..85f4a690a75 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _upload_file_oapg(
     ]: ...
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _upload_file_oapg(
 
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _upload_file_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _upload_file_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -226,7 +226,7 @@ def upload_file(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_oapg(
+        return self._upload_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -300,7 +300,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_oapg(
+        return self._upload_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.pyi
index 0b42584f181..e79e61aef18 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_file_oapg(
+    def _upload_file(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -214,7 +214,7 @@ class UploadFile(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_oapg(
+        return self._upload_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -288,7 +288,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_file_oapg(
+        return self._upload_file(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.py
index 2789cd5b86c..a5f0de6d733 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         required = {
             "file",
@@ -42,13 +42,13 @@ class Properties:
                 "file": File,
             }
     
-    file: MetaOapg.Properties.File
+    file: Schema_.Properties.File
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -65,15 +65,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["file"],
@@ -81,21 +81,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        file: typing.Union[MetaOapg.Properties.File, bytes, io.FileIO, io.BufferedReader, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        file: typing.Union[Schema_.Properties.File, bytes, io.FileIO, io.BufferedReader, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             file=file,
             additionalMetadata=additionalMetadata,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.pyi
index 26d812e9b27..b325c7a07c1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_file/post/request_body/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         required = {
             "file",
         }
@@ -41,13 +41,13 @@ class MultipartFormData(
                 "file": File,
             }
     
-    file: MetaOapg.Properties.File
+    file: Schema_.Properties.File
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -64,15 +64,15 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["file"],
@@ -80,21 +80,21 @@ class MultipartFormData(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        file: typing.Union[MetaOapg.Properties.File, bytes, io.FileIO, io.BufferedReader, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        file: typing.Union[Schema_.Properties.File, bytes, io.FileIO, io.BufferedReader, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             file=file,
             additionalMetadata=additionalMetadata,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.py
index f09a6f2f332..9c03c0063a0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.py
@@ -47,7 +47,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -60,7 +60,7 @@ def _upload_files_oapg(
     ]: ...
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -74,7 +74,7 @@ def _upload_files_oapg(
 
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -85,7 +85,7 @@ def _upload_files_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -98,7 +98,7 @@ def _upload_files_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -226,7 +226,7 @@ def upload_files(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_files_oapg(
+        return self._upload_files(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -300,7 +300,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_files_oapg(
+        return self._upload_files(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.pyi
index b50a2858e7c..549033b8cf1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/__init__.pyi
@@ -35,7 +35,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -62,7 +62,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_files_oapg(
+    def _upload_files(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -214,7 +214,7 @@ class UploadFiles(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_files_oapg(
+        return self._upload_files(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -288,7 +288,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_files_oapg(
+        return self._upload_files(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.py
index b971b9d605e..5bb50114f2b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -39,29 +39,29 @@ class Files(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.BinarySchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Files':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "files": Files,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.Properties.Files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> Schema_.Properties.Files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -77,31 +77,31 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.Properties.Files, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["files"]) -> typing.Union[Schema_.Properties.Files, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["files"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        files: typing.Union[MetaOapg.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        files: typing.Union[Schema_.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             files=files,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.pyi
index 50bf6a1c157..393d4bc1359 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/fake_upload_files/post/request_body/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             
@@ -38,29 +38,29 @@ class MultipartFormData(
             ):
             
             
-                class MetaOapg:
+                class Schema_:
                     types = {tuple}
                     Items = schemas.BinarySchema
             
                 def __new__(
                     cls,
-                    _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[MetaOapg.Items, bytes, io.FileIO, io.BufferedReader, ]]],
-                    _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+                    arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, bytes, io.FileIO, io.BufferedReader, ]], typing.List[typing.Union[Schema_.Items, bytes, io.FileIO, io.BufferedReader, ]]],
+                    configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
                 ) -> 'Files':
                     return super().__new__(
                         cls,
-                        _arg,
-                        _configuration=_configuration,
+                        arg_,
+                        configuration_=configuration_,
                     )
             
-                def __getitem__(self, i: int) -> MetaOapg.Items:
+                def __getitem__(self, i: int) -> Schema_.Items:
                     return super().__getitem__(i)
             __annotations__ = {
                 "files": Files,
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["files"]) -> MetaOapg.Properties.Files: ...
+    def __getitem__(self, name: typing_extensions.Literal["files"]) -> Schema_.Properties.Files: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -76,31 +76,31 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["files"]) -> typing.Union[MetaOapg.Properties.Files, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["files"]) -> typing.Union[Schema_.Properties.Files, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["files"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        files: typing.Union[MetaOapg.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        files: typing.Union[Schema_.Properties.Files, list, tuple, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             files=files,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.py
index 0042bcb534a..c23b9b250e6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.py
@@ -38,7 +38,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -49,7 +49,7 @@ def _foo_get_oapg(
     ]: ...
 
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -58,7 +58,7 @@ def _foo_get_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -69,7 +69,7 @@ def _foo_get_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -154,7 +154,7 @@ def foo_get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._foo_get_oapg(
+        return self._foo_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -204,7 +204,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._foo_get_oapg(
+        return self._foo_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.pyi
index 7d36e66c476..18e0b5b1c86 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _foo_get_oapg(
+    def _foo_get(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -150,7 +150,7 @@ class FooGet(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._foo_get_oapg(
+        return self._foo_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -200,7 +200,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._foo_get_oapg(
+        return self._foo_get(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.py
index fcc3409adbf..c43b8ed117f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -57,32 +57,32 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union['foo.Foo', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union['foo.Foo', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["string"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['foo.Foo', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             string=string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.pyi
index 58daffac96f..eb40de2b9c2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/foo/get/response_for_default/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
         
@@ -56,32 +56,32 @@ class ApplicationJson(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["string"]) -> typing.Union['foo.Foo', schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["string"]) -> typing.Union['foo.Foo', schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["string"],
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
+        *args_: typing.Union[dict, frozendict.frozendict, ],
         string: typing.Union['foo.Foo', schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             string=string,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.py
index a61cbf556dc..719c55c5ce6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.py
@@ -63,7 +63,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -76,7 +76,7 @@ def _add_pet_oapg(
     ]: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/xml"],
@@ -89,7 +89,7 @@ def _add_pet_oapg(
     ]: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -103,7 +103,7 @@ def _add_pet_oapg(
 
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -114,7 +114,7 @@ def _add_pet_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -127,7 +127,7 @@ def _add_pet_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = 'application/json',
@@ -158,7 +158,7 @@ class instances
             _fields = serialized_data['fields']
         elif 'body' in serialized_data:
             _body = serialized_data['body']
-        host = self._get_host_oapg('add_pet', _servers, host_index)
+        host = self._get_host('add_pet', _servers, host_index)
 
         response = self.api_client.call_api(
             resource_path=used_path,
@@ -272,7 +272,7 @@ def add_pet(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._add_pet_oapg(
+        return self._add_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
@@ -359,7 +359,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._add_pet_oapg(
+        return self._add_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.pyi
index 9a9a6f2f4c8..f42e4bece2f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/post/__init__.pyi
@@ -33,7 +33,7 @@ from . import response_for_405
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -46,7 +46,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/xml"],
@@ -59,7 +59,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -84,7 +84,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -97,7 +97,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _add_pet_oapg(
+    def _add_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = 'application/json',
@@ -128,7 +128,7 @@ class BaseApi(api_client.Api):
             _fields = serialized_data['fields']
         elif 'body' in serialized_data:
             _body = serialized_data['body']
-        host = self._get_host_oapg('add_pet', _servers, host_index)
+        host = self._get_host('add_pet', _servers, host_index)
 
         response = self.api_client.call_api(
             resource_path=used_path,
@@ -242,7 +242,7 @@ class AddPet(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._add_pet_oapg(
+        return self._add_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
@@ -329,7 +329,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._add_pet_oapg(
+        return self._add_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.py
index 6f0c6260dd2..5de29096567 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.py
@@ -66,7 +66,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -76,7 +76,7 @@ def _update_pet_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/xml"],
@@ -86,7 +86,7 @@ def _update_pet_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -97,7 +97,7 @@ def _update_pet_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -108,7 +108,7 @@ def _update_pet_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -120,7 +120,7 @@ def _update_pet_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = 'application/json',
@@ -151,7 +151,7 @@ class instances
             _fields = serialized_data['fields']
         elif 'body' in serialized_data:
             _body = serialized_data['body']
-        host = self._get_host_oapg('update_pet', _servers, host_index)
+        host = self._get_host('update_pet', _servers, host_index)
 
         response = self.api_client.call_api(
             resource_path=used_path,
@@ -256,7 +256,7 @@ def update_pet(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_oapg(
+        return self._update_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
@@ -333,7 +333,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_oapg(
+        return self._update_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.pyi
index c7ff6b1bd16..7a72a40e77d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet/put/__init__.pyi
@@ -34,7 +34,7 @@ from . import response_for_405
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,],
         content_type: typing_extensions.Literal["application/xml"],
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -76,7 +76,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = ...,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_pet_oapg(
+    def _update_pet(
         self,
         body: typing.Union[request_body.pet.Pet,request_body.pet.Pet,],
         content_type: str = 'application/json',
@@ -119,7 +119,7 @@ class BaseApi(api_client.Api):
             _fields = serialized_data['fields']
         elif 'body' in serialized_data:
             _body = serialized_data['body']
-        host = self._get_host_oapg('update_pet', _servers, host_index)
+        host = self._get_host('update_pet', _servers, host_index)
 
         response = self.api_client.call_api(
             resource_path=used_path,
@@ -224,7 +224,7 @@ class UpdatePet(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_oapg(
+        return self._update_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
@@ -301,7 +301,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_oapg(
+        return self._update_pet(
             body=body,
             content_type=content_type,
             host_index=host_index,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.py
index ad370b65cd1..c15aadf7323 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.py
@@ -79,7 +79,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -91,7 +91,7 @@ def _find_pets_by_status_oapg(
     ]: ...
 
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -101,7 +101,7 @@ def _find_pets_by_status_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -113,7 +113,7 @@ def _find_pets_by_status_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -127,7 +127,7 @@ def _find_pets_by_status_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -225,7 +225,7 @@ def find_pets_by_status(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_status_oapg(
+        return self._find_pets_by_status(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -280,7 +280,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_status_oapg(
+        return self._find_pets_by_status(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.pyi
index 9926ac2fab3..c124ea9cf50 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/__init__.pyi
@@ -60,7 +60,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -72,7 +72,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -82,7 +82,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -94,7 +94,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _find_pets_by_status_oapg(
+    def _find_pets_by_status(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -108,7 +108,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -206,7 +206,7 @@ class FindPetsByStatus(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_status_oapg(
+        return self._find_pets_by_status(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -261,7 +261,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_status_oapg(
+        return self._find_pets_by_status(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.py
index 58afc8dcb64..e6214a5bf77 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -37,7 +37,7 @@ class Items(
         ):
         
         
-            class MetaOapg:
+            class Schema_:
                 types = {
                     str,
                 }
@@ -61,14 +61,14 @@ def SOLD(cls):
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.pyi
index 0331dd56312..54eca73a580 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/parameter_0/schema.pyi
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         
@@ -50,14 +50,14 @@ class Schema(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.py
index 1e9be122970..d5323927bd9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ def items() -> typing.Type['pet.Pet']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.pyi
index 1e9be122970..d5323927bd9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ class ApplicationJson(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.py
index 8cbb3c7dbd1..0248977eea8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.py
@@ -28,7 +28,7 @@ class ApplicationXml(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ def items() -> typing.Type['pet.Pet']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationXml':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.pyi
index 8cbb3c7dbd1..0248977eea8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_status/get/response_for_200/application_xml.pyi
@@ -28,7 +28,7 @@ class ApplicationXml(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ class ApplicationXml(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationXml':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.py
index 38da8f64f06..3059c5662e5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.py
@@ -79,7 +79,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -91,7 +91,7 @@ def _find_pets_by_tags_oapg(
     ]: ...
 
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -101,7 +101,7 @@ def _find_pets_by_tags_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -113,7 +113,7 @@ def _find_pets_by_tags_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -127,7 +127,7 @@ def _find_pets_by_tags_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -225,7 +225,7 @@ def find_pets_by_tags(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_tags_oapg(
+        return self._find_pets_by_tags(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -280,7 +280,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_tags_oapg(
+        return self._find_pets_by_tags(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.pyi
index b0394a79030..db0c4bbefd4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/__init__.pyi
@@ -60,7 +60,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -72,7 +72,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -82,7 +82,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -94,7 +94,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _find_pets_by_tags_oapg(
+    def _find_pets_by_tags(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -108,7 +108,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -206,7 +206,7 @@ class FindPetsByTags(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_tags_oapg(
+        return self._find_pets_by_tags(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -261,7 +261,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._find_pets_by_tags_oapg(
+        return self._find_pets_by_tags(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.py
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.py
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.pyi
index 220d6467193..a35e06d2539 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/parameter_0/schema.pyi
@@ -28,20 +28,20 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         Items = schemas.StrSchema
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple[typing.Union[MetaOapg.Items, str, ]], typing.List[typing.Union[MetaOapg.Items, str, ]]],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple[typing.Union[Schema_.Items, str, ]], typing.List[typing.Union[Schema_.Items, str, ]]],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'Schema':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
-    def __getitem__(self, i: int) -> MetaOapg.Items:
+    def __getitem__(self, i: int) -> Schema_.Items:
         return super().__getitem__(i)
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.py
index 1e9be122970..d5323927bd9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.py
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ def items() -> typing.Type['pet.Pet']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.pyi
index 1e9be122970..d5323927bd9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_json.pyi
@@ -28,7 +28,7 @@ class ApplicationJson(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ class ApplicationJson(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationJson':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.py
index 8cbb3c7dbd1..0248977eea8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.py
@@ -28,7 +28,7 @@ class ApplicationXml(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ def items() -> typing.Type['pet.Pet']:
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationXml':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.pyi
index 8cbb3c7dbd1..0248977eea8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_find_by_tags/get/response_for_200/application_xml.pyi
@@ -28,7 +28,7 @@ class ApplicationXml(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
         
         @staticmethod
@@ -37,13 +37,13 @@ class ApplicationXml(
 
     def __new__(
         cls,
-        _arg: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        arg_: typing.Union[typing.Tuple['pet.Pet'], typing.List['pet.Pet']],
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
     ) -> 'ApplicationXml':
         return super().__new__(
             cls,
-            _arg,
-            _configuration=_configuration,
+            arg_,
+            configuration_=configuration_,
         )
 
     def __getitem__(self, i: int) -> 'pet.Pet':
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.py
index 062b93d7bfa..5b55b1c97dd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.py
@@ -95,7 +95,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -104,7 +104,7 @@ def _delete_pet_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -114,7 +114,7 @@ def _delete_pet_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -125,7 +125,7 @@ def _delete_pet_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -139,8 +139,8 @@ def _delete_pet_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -236,7 +236,7 @@ def delete_pet(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_pet_oapg(
+        return self._delete_pet(
             header_params=header_params,
             path_params=path_params,
             stream=stream,
@@ -287,7 +287,7 @@ def delete(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_pet_oapg(
+        return self._delete_pet(
             header_params=header_params,
             path_params=path_params,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.pyi
index fed1865b34a..093bcab3815 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/delete/__init__.pyi
@@ -79,7 +79,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
@@ -98,7 +98,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -109,7 +109,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_pet_oapg(
+    def _delete_pet(
         self,
         header_params: RequestHeaderParameters.Params = frozendict.frozendict(),
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -123,8 +123,8 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestHeaderParameters.Params, header_params)
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestHeaderParameters.Params, header_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -220,7 +220,7 @@ class DeletePet(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_pet_oapg(
+        return self._delete_pet(
             header_params=header_params,
             path_params=path_params,
             stream=stream,
@@ -271,7 +271,7 @@ class ApiFordelete(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_pet_oapg(
+        return self._delete_pet(
             header_params=header_params,
             path_params=path_params,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.py
index 06e7a06d1ef..72541d2804f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.py
@@ -81,7 +81,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -93,7 +93,7 @@ def _get_pet_by_id_oapg(
     ]: ...
 
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -103,7 +103,7 @@ def _get_pet_by_id_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -115,7 +115,7 @@ def _get_pet_by_id_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -129,7 +129,7 @@ def _get_pet_by_id_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -228,7 +228,7 @@ def get_pet_by_id(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_pet_by_id_oapg(
+        return self._get_pet_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -283,7 +283,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_pet_by_id_oapg(
+        return self._get_pet_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.pyi
index c9042017eb8..a7bd8e73869 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/get/__init__.pyi
@@ -61,7 +61,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -83,7 +83,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -95,7 +95,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_pet_by_id_oapg(
+    def _get_pet_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -109,7 +109,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -208,7 +208,7 @@ class GetPetById(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_pet_by_id_oapg(
+        return self._get_pet_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -263,7 +263,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_pet_by_id_oapg(
+        return self._get_pet_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.py
index 2b6d0e125e8..fb6ad3fda5c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.py
@@ -72,7 +72,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -82,7 +82,7 @@ def _update_pet_with_form_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -93,7 +93,7 @@ def _update_pet_with_form_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -104,7 +104,7 @@ def _update_pet_with_form_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -116,7 +116,7 @@ def _update_pet_with_form_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -131,7 +131,7 @@ def _update_pet_with_form_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -247,7 +247,7 @@ def update_pet_with_form(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_with_form_oapg(
+        return self._update_pet_with_form(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -314,7 +314,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_with_form_oapg(
+        return self._update_pet_with_form(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.pyi
index cf561a6444f..58fa0cc14cc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/__init__.pyi
@@ -56,7 +56,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: typing_extensions.Literal["application/x-www-form-urlencoded"] = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -66,7 +66,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -77,7 +77,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -100,7 +100,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_pet_with_form_oapg(
+    def _update_pet_with_form(
         self,
         content_type: str = 'application/x-www-form-urlencoded',
         body: typing.Union[request_body.application_x_www_form_urlencoded.ApplicationXWwwFormUrlencoded, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -115,7 +115,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -231,7 +231,7 @@ class UpdatePetWithForm(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_with_form_oapg(
+        return self._update_pet_with_form(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -298,7 +298,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_pet_with_form_oapg(
+        return self._update_pet_with_form(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.py
index 3c2930f3f79..3be62e5c02c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.py
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -40,10 +40,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,15 +60,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -76,21 +76,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             status=status,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.pyi
index 309fff1e2a0..b5e8b944ba8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id/post/request_body/application_x_www_form_urlencoded.pyi
@@ -28,7 +28,7 @@ class ApplicationXWwwFormUrlencoded(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             Name = schemas.StrSchema
@@ -39,10 +39,10 @@ class ApplicationXWwwFormUrlencoded(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["name"]) -> MetaOapg.Properties.Name: ...
+    def __getitem__(self, name: typing_extensions.Literal["name"]) -> Schema_.Properties.Name: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["status"]) -> MetaOapg.Properties.Status: ...
+    def __getitem__(self, name: typing_extensions.Literal["status"]) -> Schema_.Properties.Status: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -59,15 +59,15 @@ class ApplicationXWwwFormUrlencoded(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["name"]) -> typing.Union[MetaOapg.Properties.Name, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["name"]) -> typing.Union[Schema_.Properties.Name, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["status"]) -> typing.Union[MetaOapg.Properties.Status, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["status"]) -> typing.Union[Schema_.Properties.Status, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["name"],
@@ -75,21 +75,21 @@ class ApplicationXWwwFormUrlencoded(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        name: typing.Union[MetaOapg.Properties.Name, str, schemas.Unset] = schemas.unset,
-        status: typing.Union[MetaOapg.Properties.Status, str, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        name: typing.Union[Schema_.Properties.Name, str, schemas.Unset] = schemas.unset,
+        status: typing.Union[Schema_.Properties.Status, str, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'ApplicationXWwwFormUrlencoded':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             name=name,
             status=status,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.py
index 960194f55f4..2aa4d643e7f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.py
@@ -75,7 +75,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -89,7 +89,7 @@ def _upload_image_oapg(
     ]: ...
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -104,7 +104,7 @@ def _upload_image_oapg(
 
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -116,7 +116,7 @@ def _upload_image_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -130,7 +130,7 @@ def _upload_image_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -146,7 +146,7 @@ def _upload_image_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -277,7 +277,7 @@ def upload_image(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_image_oapg(
+        return self._upload_image(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -357,7 +357,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_image_oapg(
+        return self._upload_image(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.pyi
index 03a3387bc9a..b20f54c2cdd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/__init__.pyi
@@ -59,7 +59,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: typing_extensions.Literal["multipart/form-data"] = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         content_type: str = ...,
@@ -100,7 +100,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = ...,
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -114,7 +114,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _upload_image_oapg(
+    def _upload_image(
         self,
         content_type: str = 'multipart/form-data',
         body: typing.Union[request_body.multipart_form_data.MultipartFormData, dict, frozendict.frozendict, schemas.Unset] = schemas.unset,
@@ -130,7 +130,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -261,7 +261,7 @@ class UploadImage(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_image_oapg(
+        return self._upload_image(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -341,7 +341,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._upload_image_oapg(
+        return self._upload_image(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.py b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.py
index 9e84fbdcde1..53e1e32578f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.py
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
         
         class Properties:
@@ -40,10 +40,10 @@ class Properties:
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -60,15 +60,15 @@ def __getitem__(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union[MetaOapg.Properties.File, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> typing.Union[Schema_.Properties.File, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["additionalMetadata"],
@@ -76,21 +76,21 @@ def get_item_oapg(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        file: typing.Union[MetaOapg.Properties.File, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        file: typing.Union[Schema_.Properties.File, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             additionalMetadata=additionalMetadata,
             file=file,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.pyi
index 4a6cc2878ee..ac1c8148a32 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/pet_pet_id_upload_image/post/request_body/multipart_form_data.pyi
@@ -28,7 +28,7 @@ class MultipartFormData(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         
         class Properties:
             AdditionalMetadata = schemas.StrSchema
@@ -39,10 +39,10 @@ class MultipartFormData(
             }
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> MetaOapg.Properties.AdditionalMetadata: ...
+    def __getitem__(self, name: typing_extensions.Literal["additionalMetadata"]) -> Schema_.Properties.AdditionalMetadata: ...
     
     @typing.overload
-    def __getitem__(self, name: typing_extensions.Literal["file"]) -> MetaOapg.Properties.File: ...
+    def __getitem__(self, name: typing_extensions.Literal["file"]) -> Schema_.Properties.File: ...
     
     @typing.overload
     def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
@@ -59,15 +59,15 @@ class MultipartFormData(
         return super().__getitem__(name)
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[MetaOapg.Properties.AdditionalMetadata, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["additionalMetadata"]) -> typing.Union[Schema_.Properties.AdditionalMetadata, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: typing_extensions.Literal["file"]) -> typing.Union[MetaOapg.Properties.File, schemas.Unset]: ...
+    def get_item_(self, name: typing_extensions.Literal["file"]) -> typing.Union[Schema_.Properties.File, schemas.Unset]: ...
     
     @typing.overload
-    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+    def get_item_(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
     
-    def get_item_oapg(
+    def get_item_(
         self,
         name: typing.Union[
             typing_extensions.Literal["additionalMetadata"],
@@ -75,21 +75,21 @@ class MultipartFormData(
             str
         ]
     ):
-        return super().get_item_oapg(name)
+        return super().get_item_(name)
 
     def __new__(
         cls,
-        *_args: typing.Union[dict, frozendict.frozendict, ],
-        additionalMetadata: typing.Union[MetaOapg.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
-        file: typing.Union[MetaOapg.Properties.File, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
-        _configuration: typing.Optional[schemas.configuration_module.Configuration] = None,
+        *args_: typing.Union[dict, frozendict.frozendict, ],
+        additionalMetadata: typing.Union[Schema_.Properties.AdditionalMetadata, str, schemas.Unset] = schemas.unset,
+        file: typing.Union[Schema_.Properties.File, bytes, io.FileIO, io.BufferedReader, schemas.Unset] = schemas.unset,
+        configuration_: typing.Optional[schemas.configuration_module.Configuration] = None,
         **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, bytes, io.FileIO, io.BufferedReader, schemas.Schema],
     ) -> 'MultipartFormData':
         return super().__new__(
             cls,
-            *_args,
+            *args_,
             additionalMetadata=additionalMetadata,
             file=file,
-            _configuration=_configuration,
+            configuration_=configuration_,
             **kwargs,
         )
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.py
index 5961d4859e8..c90dff97a1b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.py
@@ -50,7 +50,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -61,7 +61,7 @@ def _get_inventory_oapg(
     ]: ...
 
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -70,7 +70,7 @@ def _get_inventory_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -81,7 +81,7 @@ def _get_inventory_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -175,7 +175,7 @@ def get_inventory(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_inventory_oapg(
+        return self._get_inventory(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -225,7 +225,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_inventory_oapg(
+        return self._get_inventory(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.pyi
index 1d8c16d34a7..5df56588f7b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_inventory/get/__init__.pyi
@@ -34,7 +34,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -45,7 +45,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -54,7 +54,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -65,7 +65,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_inventory_oapg(
+    def _get_inventory(
         self,
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
         stream: bool = False,
@@ -159,7 +159,7 @@ class GetInventory(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_inventory_oapg(
+        return self._get_inventory(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
@@ -209,7 +209,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_inventory_oapg(
+        return self._get_inventory(
             accept_content_types=accept_content_types,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.py
index d6c90305138..ed017f1eae1 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.py
@@ -51,7 +51,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -64,7 +64,7 @@ def _place_order_oapg(
     ]: ...
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = ...,
@@ -78,7 +78,7 @@ def _place_order_oapg(
 
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -89,7 +89,7 @@ def _place_order_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = ...,
@@ -102,7 +102,7 @@ def _place_order_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = 'application/json',
@@ -233,7 +233,7 @@ def place_order(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._place_order_oapg(
+        return self._place_order(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -307,7 +307,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._place_order_oapg(
+        return self._place_order(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.pyi
index 9db59f44188..15350c6ea43 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order/post/__init__.pyi
@@ -37,7 +37,7 @@ _all_accept_content_types = (
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -50,7 +50,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = ...,
@@ -64,7 +64,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -75,7 +75,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = ...,
@@ -88,7 +88,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _place_order_oapg(
+    def _place_order(
         self,
         body: typing.Union[request_body.order.Order,],
         content_type: str = 'application/json',
@@ -219,7 +219,7 @@ class PlaceOrder(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._place_order_oapg(
+        return self._place_order(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
@@ -293,7 +293,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._place_order_oapg(
+        return self._place_order(
             body=body,
             content_type=content_type,
             accept_content_types=accept_content_types,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.py
index 254abe2756a..d90ca2b8e54 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.py
@@ -69,7 +69,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -77,7 +77,7 @@ def _delete_order_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -86,7 +86,7 @@ def _delete_order_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -96,7 +96,7 @@ def _delete_order_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -109,7 +109,7 @@ def _delete_order_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -192,7 +192,7 @@ def delete_order(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_order_oapg(
+        return self._delete_order(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -238,7 +238,7 @@ def delete(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_order_oapg(
+        return self._delete_order(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.pyi
index 46914e5ca99..f75c3ccb6b0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/delete/__init__.pyi
@@ -55,7 +55,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -63,7 +63,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -72,7 +72,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -82,7 +82,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_order_oapg(
+    def _delete_order(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -95,7 +95,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -178,7 +178,7 @@ class DeleteOrder(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_order_oapg(
+        return self._delete_order(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -224,7 +224,7 @@ class ApiFordelete(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_order_oapg(
+        return self._delete_order(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.py
index 278eb6bffbe..fd5917a4b54 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.py
@@ -77,7 +77,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -89,7 +89,7 @@ def _get_order_by_id_oapg(
     ]: ...
 
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -99,7 +99,7 @@ def _get_order_by_id_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -111,7 +111,7 @@ def _get_order_by_id_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -125,7 +125,7 @@ def _get_order_by_id_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -223,7 +223,7 @@ def get_order_by_id(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_order_by_id_oapg(
+        return self._get_order_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -278,7 +278,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_order_by_id_oapg(
+        return self._get_order_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.pyi
index 6fc4d821240..b83614df24b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/__init__.pyi
@@ -61,7 +61,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -83,7 +83,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -95,7 +95,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_order_by_id_oapg(
+    def _get_order_by_id(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -109,7 +109,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -207,7 +207,7 @@ class GetOrderById(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_order_by_id_oapg(
+        return self._get_order_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -262,7 +262,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_order_by_id_oapg(
+        return self._get_order_by_id(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/parameter_0/schema.py b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/parameter_0/schema.py
index 38be237a0f2..85cc435ad0b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/parameter_0/schema.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/store_order_order_id/get/parameter_0/schema.py
@@ -28,7 +28,7 @@ class Schema(
 ):
 
 
-    class MetaOapg:
+    class Schema_:
         types = {
             decimal.Decimal,
         }
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.py
index a2857ac3e29..b470da3ca00 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.py
@@ -36,7 +36,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ def _create_user_oapg(
     ]: ...
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -61,7 +61,7 @@ def _create_user_oapg(
 
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -71,7 +71,7 @@ def _create_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -83,7 +83,7 @@ def _create_user_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -197,7 +197,7 @@ def create_user(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_user_oapg(
+        return self._create_user(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -265,7 +265,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_user_oapg(
+        return self._create_user(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.pyi
index d71581a9752..560bad8590d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import request_body
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_user_oapg(
+    def _create_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -193,7 +193,7 @@ class CreateUser(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_user_oapg(
+        return self._create_user(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -261,7 +261,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_user_oapg(
+        return self._create_user(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.py
index 46af9297e7c..7c4e871a1f8 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.py
@@ -36,7 +36,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ def _create_users_with_array_input_oapg(
     ]: ...
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -61,7 +61,7 @@ def _create_users_with_array_input_oapg(
 
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -71,7 +71,7 @@ def _create_users_with_array_input_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -83,7 +83,7 @@ def _create_users_with_array_input_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = 'application/json',
@@ -197,7 +197,7 @@ def create_users_with_array_input(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_array_input_oapg(
+        return self._create_users_with_array_input(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -265,7 +265,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_array_input_oapg(
+        return self._create_users_with_array_input(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.pyi
index f502a409222..8c4f298327f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_array/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import response_for_default
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_users_with_array_input_oapg(
+    def _create_users_with_array_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = 'application/json',
@@ -193,7 +193,7 @@ class CreateUsersWithArrayInput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_array_input_oapg(
+        return self._create_users_with_array_input(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -261,7 +261,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_array_input_oapg(
+        return self._create_users_with_array_input(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.py
index b9629abcade..03bdb81124e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.py
@@ -36,7 +36,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -48,7 +48,7 @@ def _create_users_with_list_input_oapg(
     ]: ...
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -61,7 +61,7 @@ def _create_users_with_list_input_oapg(
 
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -71,7 +71,7 @@ def _create_users_with_list_input_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -83,7 +83,7 @@ def _create_users_with_list_input_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = 'application/json',
@@ -197,7 +197,7 @@ def create_users_with_list_input(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_list_input_oapg(
+        return self._create_users_with_list_input(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -265,7 +265,7 @@ def post(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_list_input_oapg(
+        return self._create_users_with_list_input(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.pyi
index 09b8c76d9d4..e6a6e3d1193 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_create_with_list/post/__init__.pyi
@@ -32,7 +32,7 @@ from . import response_for_default
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -44,7 +44,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -57,7 +57,7 @@ class BaseApi(api_client.Api):
 
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         skip_deserialization: typing_extensions.Literal[True],
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = ...,
@@ -79,7 +79,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _create_users_with_list_input_oapg(
+    def _create_users_with_list_input(
         self,
         body: typing.Union[request_body.application_json.ApplicationJson,list, tuple, ],
         content_type: str = 'application/json',
@@ -193,7 +193,7 @@ class CreateUsersWithListInput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_list_input_oapg(
+        return self._create_users_with_list_input(
             body=body,
             content_type=content_type,
             stream=stream,
@@ -261,7 +261,7 @@ class ApiForpost(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._create_users_with_list_input_oapg(
+        return self._create_users_with_list_input(
             body=body,
             content_type=content_type,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.py
index c52de991988..abf79b92ebf 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.py
@@ -77,7 +77,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -89,7 +89,7 @@ def _login_user_oapg(
     ]: ...
 
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -99,7 +99,7 @@ def _login_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -111,7 +111,7 @@ def _login_user_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -125,7 +125,7 @@ def _login_user_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -222,7 +222,7 @@ def login_user(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._login_user_oapg(
+        return self._login_user(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -277,7 +277,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._login_user_oapg(
+        return self._login_user(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.pyi
index 7ee16ee4aa2..fd9146d8b34 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_login/get/__init__.pyi
@@ -63,7 +63,7 @@ class RequestQueryParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -75,7 +75,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
@@ -85,7 +85,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -97,7 +97,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _login_user_oapg(
+    def _login_user(
         self,
         query_params: RequestQueryParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -111,7 +111,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestQueryParameters.Params, query_params)
+        self._verify_typed_dict_inputs(RequestQueryParameters.Params, query_params)
         used_path = path
 
         prefix_separator_iterator = None
@@ -208,7 +208,7 @@ class LoginUser(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._login_user_oapg(
+        return self._login_user(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -263,7 +263,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._login_user_oapg(
+        return self._login_user(
             query_params=query_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.py
index b2d18e5d23f..4e1f6bbc4e4 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.py
@@ -34,7 +34,7 @@
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -44,7 +44,7 @@ def _logout_user_oapg(
     ]: ...
 
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
@@ -52,7 +52,7 @@ def _logout_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -62,7 +62,7 @@ def _logout_user_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -137,7 +137,7 @@ def logout_user(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._logout_user_oapg(
+        return self._logout_user(
             stream=stream,
             timeout=timeout,
             skip_deserialization=skip_deserialization
@@ -182,7 +182,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._logout_user_oapg(
+        return self._logout_user(
             stream=stream,
             timeout=timeout,
             skip_deserialization=skip_deserialization
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.pyi
index 8be8f903ead..a590f97886c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_logout/get/__init__.pyi
@@ -30,7 +30,7 @@ from petstore_api.components.responses import response_success_description_only
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -40,7 +40,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         stream: bool = False,
@@ -48,7 +48,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -58,7 +58,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _logout_user_oapg(
+    def _logout_user(
         self,
         stream: bool = False,
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
@@ -133,7 +133,7 @@ class LogoutUser(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._logout_user_oapg(
+        return self._logout_user(
             stream=stream,
             timeout=timeout,
             skip_deserialization=skip_deserialization
@@ -178,7 +178,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._logout_user_oapg(
+        return self._logout_user(
             stream=stream,
             timeout=timeout,
             skip_deserialization=skip_deserialization
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.py
index ff56c5a3e4e..a077e6e2613 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.py
@@ -69,7 +69,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -80,7 +80,7 @@ def _delete_user_oapg(
     ]: ...
 
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -89,7 +89,7 @@ def _delete_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -100,7 +100,7 @@ def _delete_user_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -113,7 +113,7 @@ def _delete_user_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -200,7 +200,7 @@ def delete_user(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_user_oapg(
+        return self._delete_user(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -250,7 +250,7 @@ def delete(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_user_oapg(
+        return self._delete_user(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.pyi
index 14c33fcf8ca..da7b281234d 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/delete/__init__.pyi
@@ -55,7 +55,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -66,7 +66,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -75,7 +75,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -86,7 +86,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _delete_user_oapg(
+    def _delete_user(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         stream: bool = False,
@@ -99,7 +99,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -186,7 +186,7 @@ class DeleteUser(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_user_oapg(
+        return self._delete_user(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
@@ -236,7 +236,7 @@ class ApiFordelete(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._delete_user_oapg(
+        return self._delete_user(
             path_params=path_params,
             stream=stream,
             timeout=timeout,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.py
index 4e315229295..665de572c8a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.py
@@ -77,7 +77,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -89,7 +89,7 @@ def _get_user_by_name_oapg(
     ]: ...
 
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -99,7 +99,7 @@ def _get_user_by_name_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -111,7 +111,7 @@ def _get_user_by_name_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -125,7 +125,7 @@ def _get_user_by_name_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -223,7 +223,7 @@ def get_user_by_name(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_user_by_name_oapg(
+        return self._get_user_by_name(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -278,7 +278,7 @@ def get(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_user_by_name_oapg(
+        return self._get_user_by_name(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.pyi
index 5c3f8cd69d6..c60943f72da 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/get/__init__.pyi
@@ -61,7 +61,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -73,7 +73,7 @@ class BaseApi(api_client.Api):
     ]: ...
 
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         skip_deserialization: typing_extensions.Literal[True],
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
@@ -83,7 +83,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -95,7 +95,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _get_user_by_name_oapg(
+    def _get_user_by_name(
         self,
         path_params: RequestPathParameters.Params = frozendict.frozendict(),
         accept_content_types: typing.Tuple[str] = _all_accept_content_types,
@@ -109,7 +109,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -207,7 +207,7 @@ class GetUserByName(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_user_by_name_oapg(
+        return self._get_user_by_name(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
@@ -262,7 +262,7 @@ class ApiForget(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._get_user_by_name_oapg(
+        return self._get_user_by_name(
             path_params=path_params,
             accept_content_types=accept_content_types,
             stream=stream,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.py b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.py
index 036c25750fa..f0ca137e746 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.py
@@ -71,7 +71,7 @@ class Params(RequiredParams, OptionalParams):
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -81,7 +81,7 @@ def _update_user_oapg(
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -92,7 +92,7 @@ def _update_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -103,7 +103,7 @@ def _update_user_oapg(
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -115,7 +115,7 @@ def _update_user_oapg(
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -130,7 +130,7 @@ def _update_user_oapg(
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -248,7 +248,7 @@ def update_user(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_user_oapg(
+        return self._update_user(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -315,7 +315,7 @@ def put(
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_user_oapg(
+        return self._update_user(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.pyi b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.pyi
index c0638d4e808..f3735ad1a49 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.pyi
+++ b/samples/openapi3/client/petstore/python/petstore_api/paths/user_username/put/__init__.pyi
@@ -57,7 +57,7 @@ class RequestPathParameters:
 
 class BaseApi(api_client.Api):
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: typing_extensions.Literal["application/json"] = ...,
@@ -67,7 +67,7 @@ class BaseApi(api_client.Api):
         skip_deserialization: typing_extensions.Literal[False] = ...,
     ) -> api_client.ApiResponseWithoutDeserialization: ...
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -78,7 +78,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         skip_deserialization: typing_extensions.Literal[True],
@@ -89,7 +89,7 @@ class BaseApi(api_client.Api):
     ) -> api_client.ApiResponseWithoutDeserialization: ...
 
     @typing.overload
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = ...,
@@ -101,7 +101,7 @@ class BaseApi(api_client.Api):
         api_client.ApiResponseWithoutDeserialization,
     ]: ...
 
-    def _update_user_oapg(
+    def _update_user(
         self,
         body: typing.Union[request_body.user.User,],
         content_type: str = 'application/json',
@@ -116,7 +116,7 @@ class BaseApi(api_client.Api):
             api_response.body and api_response.headers will not be deserialized into schema
             class instances
         """
-        self._verify_typed_dict_inputs_oapg(RequestPathParameters.Params, path_params)
+        self._verify_typed_dict_inputs(RequestPathParameters.Params, path_params)
         used_path = path
 
         _path_params = {}
@@ -234,7 +234,7 @@ class UpdateUser(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_user_oapg(
+        return self._update_user(
             body=body,
             path_params=path_params,
             content_type=content_type,
@@ -301,7 +301,7 @@ class ApiForput(BaseApi):
         timeout: typing.Optional[typing.Union[int, typing.Tuple]] = None,
         skip_deserialization: bool = False,
     ):
-        return self._update_user_oapg(
+        return self._update_user(
             body=body,
             path_params=path_params,
             content_type=content_type,
diff --git a/samples/openapi3/client/petstore/python/petstore_api/schemas.py b/samples/openapi3/client/petstore/python/petstore_api/schemas.py
index 7d37d2fad98..290b8d3776f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/schemas.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/schemas.py
@@ -46,17 +46,17 @@ class FileIO(io.FileIO):
     Note: this class is not immutable
     """
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader]):
-        if isinstance(_arg, (io.FileIO, io.BufferedReader)):
-            if _arg.closed:
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader]):
+        if isinstance(arg_, (io.FileIO, io.BufferedReader)):
+            if arg_.closed:
                 raise exceptions.ApiValueError('Invalid file state; file is closed and must be open')
-            _arg.close()
-            inst = super(FileIO, cls).__new__(cls, _arg.name)
-            super(FileIO, inst).__init__(_arg.name)
+            arg_.close()
+            inst = super(FileIO, cls).__new__(cls, arg_.name)
+            super(FileIO, inst).__init__(arg_.name)
             return inst
-        raise exceptions.ApiValueError('FileIO must be passed _arg which contains the open file')
+        raise exceptions.ApiValueError('FileIO must be passed arg_ which contains the open file')
 
-    def __init__(self, _arg: typing.Union[io.FileIO, io.BufferedReader]):
+    def __init__(self, arg_: typing.Union[io.FileIO, io.BufferedReader]):
         pass
 
 
@@ -150,11 +150,11 @@ def add_deeper_validated_schemas(validation_metadata: ValidationMetadata, path_t
 class Singleton:
     """
     Enums and singletons are the same
-    The same instance is returned for a given key of (cls, _arg)
+    The same instance is returned for a given key of (cls, arg_)
     """
     _instances = {}
 
-    def __new__(cls, _arg: typing.Any, **kwargs):
+    def __new__(cls, arg_: typing.Any, **kwargs):
         """
         cls base classes: BoolClass, NoneClass, str, decimal.Decimal
         The 3rd key is used in the tuple below for a corner case where an enum contains integer 1
@@ -162,15 +162,15 @@ def __new__(cls, _arg: typing.Any, **kwargs):
         Decimal('1.0') == Decimal('1')
         But if we omitted the 3rd value in the key, then Decimal('1.0') would be stored as Decimal('1')
         and json serializing that instance would be '1' rather than the expected '1.0'
-        Adding the 3rd value, the str of _arg ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
+        Adding the 3rd value, the str of arg_ ensures that 1.0 -> Decimal('1.0') which is serialized as 1.0
         """
-        key = (cls, _arg, str(_arg))
+        key = (cls, arg_, str(arg_))
         if key not in cls._instances:
-            if isinstance(_arg, (none_type, bool, BoolClass, NoneClass)):
+            if isinstance(arg_, (none_type, bool, BoolClass, NoneClass)):
                 inst = super().__new__(cls)
                 cls._instances[key] = inst
             else:
-                cls._instances[key] = super().__new__(cls, _arg)
+                cls._instances[key] = super().__new__(cls, arg_)
         return cls._instances[key]
 
     def __repr__(self):
@@ -218,7 +218,7 @@ def __bool__(self) -> bool:
         raise ValueError('Unable to find the boolean value of this instance')
 
 
-class MetaOapgTyped:
+class SchemaTyped:
     types: typing.Optional[typing.Set[typing.Type]]
     exclusive_maximum: typing.Union[int, float]
     inclusive_maximum: typing.Union[int, float]
@@ -324,7 +324,7 @@ def validate_enum(
     return None
 
 
-def _raise_validation_error_message_oapg(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
+def _raise_validation_error_message(value, constraint_msg, constraint_value, path_to_item, additional_txt=""):
     raise exceptions.ApiValueError(
         "Invalid value `{value}`, {constraint_msg} `{constraint_value}`{additional_txt} at {path_to_item}".format(
             value=value,
@@ -345,7 +345,7 @@ def validate_unique_items(
     if not unique_items_value or not isinstance(arg, tuple):
         return None
     if len(arg) > len(set(arg)):
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="duplicate items were found, and the tuple must not contain duplicates because",
             constraint_value='unique_items==True',
@@ -363,7 +363,7 @@ def validate_min_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) < min_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be greater than or equal to",
             constraint_value=min_items,
@@ -381,7 +381,7 @@ def validate_max_items(
     if not isinstance(arg, tuple):
         return None
     if len(arg) > max_items:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of items must be less than or equal to",
             constraint_value=max_items,
@@ -399,7 +399,7 @@ def validate_min_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) < min_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be greater than or equal to",
             constraint_value=min_properties,
@@ -417,7 +417,7 @@ def validate_max_properties(
     if not isinstance(arg, frozendict.frozendict):
         return None
     if len(arg) > max_properties:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="number of properties must be less than or equal to",
             constraint_value=max_properties,
@@ -435,7 +435,7 @@ def validate_min_length(
     if not isinstance(arg, str):
         return None
     if len(arg) < min_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be greater than or equal to",
             constraint_value=min_length,
@@ -453,7 +453,7 @@ def validate_max_length(
     if not isinstance(arg, str):
         return None
     if len(arg) > max_length:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="length must be less than or equal to",
             constraint_value=max_length,
@@ -471,7 +471,7 @@ def validate_inclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg < inclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than or equal to",
             constraint_value=inclusive_minimum,
@@ -489,7 +489,7 @@ def validate_exclusive_minimum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg <= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value greater than",
             constraint_value=exclusive_minimum,
@@ -507,7 +507,7 @@ def validate_inclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg > inclusive_maximum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than or equal to",
             constraint_value=inclusive_maximum,
@@ -525,7 +525,7 @@ def validate_exclusive_maximum(
     if not isinstance(arg, decimal.Decimal):
         return None
     if arg >= exclusive_minimum:
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must be a value less than",
             constraint_value=exclusive_maximum,
@@ -543,7 +543,7 @@ def validate_multiple_of(
         return None
     if (not (float(arg) / multiple_of).is_integer()):
         # Note 'multipleOf' will be as good as the floating point arithmetic.
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="value must be a multiple of",
             constraint_value=multiple_of,
@@ -565,14 +565,14 @@ def validate_regex(
         if flags != 0:
             # Don't print the regex flags if the flags are not
             # specified in the OAS document.
-            _raise_validation_error_message_oapg(
+            _raise_validation_error_message(
                 value=arg,
                 constraint_msg="must match regular expression",
                 constraint_value=regex_dict['pattern'],
                 path_to_item=validation_metadata.path_to_item,
                 additional_txt=" with flags=`{}`".format(flags)
             )
-        _raise_validation_error_message_oapg(
+        _raise_validation_error_message(
             value=arg,
             constraint_msg="must match regular expression",
             constraint_value=regex_dict['pattern'],
@@ -755,7 +755,7 @@ def validate_required(
     return None
 
 
-def _get_class_oapg(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
+def _get_class(item_cls: typing.Union[types.FunctionType, staticmethod, typing.Type['Schema']]) -> typing.Type['Schema']:
     if isinstance(item_cls, types.FunctionType):
         # referenced schema
         return item_cls()
@@ -773,7 +773,7 @@ def validate_items(
 ) -> PathToSchemasType:
     if not isinstance(arg, tuple):
         return None
-    item_cls = _get_class_oapg(item_cls)
+    item_cls = _get_class(item_cls)
     path_to_schemas = {}
     for i, value in enumerate(arg):
         item_validation_metadata = ValidationMetadata(
@@ -784,7 +784,7 @@ def validate_items(
         if item_validation_metadata.validation_ran_earlier(item_cls):
             add_deeper_validated_schemas(item_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = item_cls._validate_oapg(
+        other_path_to_schemas = item_cls._validate(
             value, validation_metadata=item_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
@@ -803,7 +803,7 @@ def validate_properties(
     for property_name, value in present_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
         schema = properties.__annotations__[property_name]
-        schema = _get_class_oapg(schema)
+        schema = _get_class(schema)
         arg_validation_metadata = ValidationMetadata(
             path_to_item=path_to_item,
             configuration=validation_metadata.configuration,
@@ -812,7 +812,7 @@ def validate_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -825,9 +825,9 @@ def validate_additional_properties(
 ) -> typing.Optional[PathToSchemasType]:
     if not isinstance(arg, frozendict.frozendict):
         return None
-    schema = _get_class_oapg(additional_properties_schema)
+    schema = _get_class(additional_properties_schema)
     path_to_schemas = {}
-    properties_annotations = cls.MetaOapg.Properties.__annotations__ if hasattr(cls.MetaOapg, 'Properties') else {}
+    properties_annotations = cls.Schema_.Properties.__annotations__ if hasattr(cls.Schema_, 'Properties') else {}
     present_additional_properties = {k: v for k, v, in arg.items() if k not in properties_annotations}
     for property_name, value in present_additional_properties.items():
         path_to_item = validation_metadata.path_to_item + (property_name,)
@@ -839,7 +839,7 @@ def validate_additional_properties(
         if arg_validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(arg_validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(value, validation_metadata=arg_validation_metadata)
+        other_path_to_schemas = schema._validate(value, validation_metadata=arg_validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -853,14 +853,14 @@ def validate_one_of(
     oneof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for one_of_cls in one_of_container_cls.classes:
-        schema = _get_class_oapg(one_of_cls)
+        schema = _get_class(one_of_cls)
         if schema in path_to_schemas[validation_metadata.path_to_item]:
             oneof_classes.append(schema)
             continue
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             oneof_classes.append(schema)
             continue
@@ -869,7 +869,7 @@ def validate_one_of(
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
         try:
-            path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate oneof_classes
             continue
@@ -897,11 +897,11 @@ def validate_any_of(
     anyof_classes = []
     path_to_schemas = collections.defaultdict(set)
     for any_of_cls in any_of_container_cls.classes:
-        schema = _get_class_oapg(any_of_cls)
+        schema = _get_class(any_of_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             anyof_classes.append(schema)
             continue
@@ -911,7 +911,7 @@ def validate_any_of(
             continue
 
         try:
-            other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         except (exceptions.ApiValueError, exceptions.ApiTypeError) as ex:
             # silence exceptions because the code needs to accumulate anyof_classes
             continue
@@ -933,17 +933,17 @@ def validate_all_of(
 ) -> PathToSchemasType:
     path_to_schemas = collections.defaultdict(set)
     for allof_cls in all_of_cls.classes:
-        schema = _get_class_oapg(allof_cls)
+        schema = _get_class(allof_cls)
         if schema is cls:
             """
             optimistically assume that cls schema will pass validation
-            do not invoke _validate_oapg on it because that is recursive
+            do not invoke _validate on it because that is recursive
             """
             continue
         if validation_metadata.validation_ran_earlier(schema):
             add_deeper_validated_schemas(validation_metadata, path_to_schemas)
             continue
-        other_path_to_schemas = schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = schema._validate(arg, validation_metadata=validation_metadata)
         update(path_to_schemas, other_path_to_schemas)
     return path_to_schemas
 
@@ -954,7 +954,7 @@ def validate_not(
     cls: typing.Type,
     validation_metadata: ValidationMetadata,
 ) -> None:
-    not_schema = _get_class_oapg(not_cls)
+    not_schema = _get_class(not_cls)
     other_path_to_schemas = None
     not_exception = exceptions.ApiValueError(
         "Invalid value '{}' was passed in to {}. Value is invalid because it is disallowed by {}".format(
@@ -967,7 +967,7 @@ def validate_not(
         raise not_exception
 
     try:
-        other_path_to_schemas = not_schema._validate_oapg(arg, validation_metadata=validation_metadata)
+        other_path_to_schemas = not_schema._validate(arg, validation_metadata=validation_metadata)
     except (exceptions.ApiValueError, exceptions.ApiTypeError):
         pass
     if other_path_to_schemas:
@@ -992,38 +992,38 @@ def __get_discriminated_class(cls, disc_property_name: str, disc_payload_value:
     """
     Used in schemas with discriminators
     """
-    if not hasattr(cls.MetaOapg, 'discriminator'):
+    if not hasattr(cls.Schema_, 'discriminator'):
         return None
-    disc = cls.MetaOapg.discriminator()
+    disc = cls.Schema_.discriminator()
     if disc_property_name not in disc:
         return None
     discriminated_cls = disc[disc_property_name].get(disc_payload_value)
     if discriminated_cls is not None:
         return discriminated_cls
     if not (
-        hasattr(cls.MetaOapg, 'AllOf') or
-        hasattr(cls.MetaOapg, 'OneOf') or
-        hasattr(cls.MetaOapg, 'AnyOf')
+        hasattr(cls.Schema_, 'AllOf') or
+        hasattr(cls.Schema_, 'OneOf') or
+        hasattr(cls.Schema_, 'AnyOf')
     ):
         return None
     # TODO stop traveling if a cycle is hit
-    if hasattr(cls.MetaOapg, 'AllOf'):
-        for allof_cls in cls.MetaOapg.AllOf.classes:
-            allof_cls = _get_class_oapg(allof_cls)
+    if hasattr(cls.Schema_, 'AllOf'):
+        for allof_cls in cls.Schema_.AllOf.classes:
+            allof_cls = _get_class(allof_cls)
             discriminated_cls = __get_discriminated_class(
                 allof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'OneOf'):
-        for oneof_cls in cls.MetaOapg.OneOf.classes:
-            oneof_cls = _get_class_oapg(oneof_cls)
+    if hasattr(cls.Schema_, 'OneOf'):
+        for oneof_cls in cls.Schema_.OneOf.classes:
+            oneof_cls = _get_class(oneof_cls)
             discriminated_cls = __get_discriminated_class(
                 oneof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
                 return discriminated_cls
-    if hasattr(cls.MetaOapg, 'AnyOf'):
-        for anyof_cls in cls.MetaOapg.AnyOf.classes:
-            anyof_cls = _get_class_oapg(anyof_cls)
+    if hasattr(cls.Schema_, 'AnyOf'):
+        for anyof_cls in cls.Schema_.AnyOf.classes:
+            anyof_cls = _get_class(anyof_cls)
             discriminated_cls = __get_discriminated_class(
                 anyof_cls, disc_property_name=disc_property_name, disc_payload_value=disc_payload_value)
             if discriminated_cls is not None:
@@ -1057,7 +1057,7 @@ def validate_discriminator(
     if discriminated_cls is cls:
         """
         Optimistically assume that cls will pass validation
-        If the code invoked _validate_oapg on cls it would infinitely recurse
+        If the code invoked _validate on cls it would infinitely recurse
         """
         return None
     if validation_metadata.validation_ran_earlier(discriminated_cls):
@@ -1070,7 +1070,7 @@ def validate_discriminator(
         seen_classes=validation_metadata.seen_classes | frozenset({cls}),
         validated_path_to_schemas=validation_metadata.validated_path_to_schemas
     )
-    return discriminated_cls._validate_oapg(arg, validation_metadata=updated_vm)
+    return discriminated_cls._validate(arg, validation_metadata=updated_vm)
 
 
 json_schema_keyword_to_validator = {
@@ -1111,7 +1111,7 @@ class Schema:
     the base class of all swagger/openapi schemas/models
     """
     __inheritable_primitive_types_set = {decimal.Decimal, str, tuple, frozendict.frozendict, FileIO, bytes, BoolClass, NoneClass}
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
     __excluded_cls_properties = {
         '__module__',
         '__dict__',
@@ -1120,7 +1120,7 @@ class Schema:
     }
 
     @classmethod
-    def _validate_oapg(
+    def _validate(
         cls,
         arg,
         validation_metadata: ValidationMetadata,
@@ -1132,7 +1132,7 @@ def _validate_oapg(
         """
         json_schema_data = {
             k: v
-            for k, v in vars(cls.MetaOapg).items()
+            for k, v in vars(cls.Schema_).items()
             if k not in cls.__excluded_cls_properties
             and k
             not in validation_metadata.configuration.disabled_json_schema_python_keywords
@@ -1158,7 +1158,7 @@ def _validate_oapg(
         return path_to_schemas
 
     @staticmethod
-    def _process_schema_classes_oapg(
+    def _process_schema_classes(
         schema_classes: typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]
     ):
         """
@@ -1207,21 +1207,21 @@ def __get_new_cls(
 
         Dict property + List Item Assignment Use cases:
         1. value is NOT an instance of the required schema class
-            the value is validated by _validate_oapg
-            _validate_oapg returns a key value pair
+            the value is validated by _validate
+            _validate returns a key value pair
             where the key is the path to the item, and the value will be the required manufactured class
             made out of the matching schemas
         2. value is an instance of the correct schema type
-            the value is NOT validated by _validate_oapg, _validate_oapg only checks that the instance is of the correct schema type
-            for this value, _validate_oapg does NOT return an entry for it in _path_to_schemas
-            and in list/dict _get_items_oapg,_get_properties_oapg the value will be directly assigned
+            the value is NOT validated by _validate, _validate only checks that the instance is of the correct schema type
+            for this value, _validate does NOT return an entry for it in _path_to_schemas
+            and in list/dict _get_items,_get_properties the value will be directly assigned
             because value is of the correct type, and validation was run earlier when the instance was created
         """
         _path_to_schemas = {}
         if validation_metadata.validation_ran_earlier(cls):
             add_deeper_validated_schemas(validation_metadata, _path_to_schemas)
         else:
-            other_path_to_schemas = cls._validate_oapg(arg, validation_metadata=validation_metadata)
+            other_path_to_schemas = cls._validate(arg, validation_metadata=validation_metadata)
             update(_path_to_schemas, other_path_to_schemas)
         # loop through it make a new class for each entry
         # do not modify the returned result because it is cached and we would be modifying the cached value
@@ -1235,9 +1235,9 @@ def __get_new_cls(
                 Singleton already added
             3. N number of schema classes, classes in path_to_schemas: BoolClass/NoneClass/tuple/frozendict.frozendict/str/Decimal/bytes/FileIo
             """
-            cls._process_schema_classes_oapg(schema_classes)
+            cls._process_schema_classes(schema_classes)
             enum_schema = any(
-                issubclass(this_cls, Schema) and hasattr(this_cls.MetaOapg, "enum_value_to_name")
+                issubclass(this_cls, Schema) and hasattr(this_cls.Schema_, "enum_value_to_name")
                 for this_cls in schema_classes
             )
             inheritable_primitive_type = schema_classes.intersection(cls.__inheritable_primitive_types_set)
@@ -1265,7 +1265,7 @@ def __get_new_cls(
         return path_to_schemas
 
     @classmethod
-    def _get_new_instance_without_conversion_oapg(
+    def _get_new_instance_without_conversion(
         cls,
         arg: typing.Any,
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
@@ -1273,10 +1273,10 @@ def _get_new_instance_without_conversion_oapg(
     ):
         # We have a Dynamic class and we are making an instance of it
         if issubclass(cls, frozendict.frozendict) and issubclass(cls, DictBase):
-            properties = cls._get_properties_oapg(arg, path_to_item, path_to_schemas)
+            properties = cls._get_properties(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, properties)
         elif issubclass(cls, tuple) and issubclass(cls, ListBase):
-            items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
+            items = cls._get_items(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, items)
         """
         str = openapi str, datetime.date, and datetime.datetime
@@ -1287,7 +1287,7 @@ def _get_new_instance_without_conversion_oapg(
         return super(Schema, cls).__new__(cls, arg)
 
     @classmethod
-    def from_openapi_data_oapg(
+    def from_openapi_data_(
         cls,
         arg: typing.Union[
             str,
@@ -1301,10 +1301,10 @@ def from_openapi_data_oapg(
             io.BufferedReader,
             bytes
         ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None
+        configuration_: typing.Optional[configuration_module.Configuration] = None
     ):
         """
-        Schema from_openapi_data_oapg
+        Schema from_openapi_data_
         """
         from_server = True
         validated_path_to_schemas = {}
@@ -1312,12 +1312,12 @@ def from_openapi_data_oapg(
         arg = cast_to_allowed_types(arg, from_server, validated_path_to_schemas, ('args[0]',), path_to_type)
         validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(validated_path_to_schemas)
         )
         path_to_schemas = cls.__get_new_cls(arg, validation_metadata, path_to_type)
         new_cls = path_to_schemas[validation_metadata.path_to_item]
-        new_inst = new_cls._get_new_instance_without_conversion_oapg(
+        new_inst = new_cls._get_new_instance_without_conversion(
             arg,
             validation_metadata.path_to_item,
             path_to_schemas
@@ -1339,7 +1339,7 @@ def __remove_unsets(kwargs):
 
     def __new__(
         cls,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict,
             frozendict.frozendict,
             list,
@@ -1357,7 +1357,7 @@ def __new__(
             io.FileIO,
             io.BufferedReader,
             'Schema',        ],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict,
             frozendict.frozendict,
@@ -1382,23 +1382,23 @@ def __new__(
         Schema __new__
 
         Args:
-            _args (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
+            args_ (int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): the value
             kwargs (str, int/float/decimal.Decimal/str/list/tuple/dict/frozendict.frozendict/bool/None): dict values
-            _configuration: contains the configuration_module.Configuration that enables json schema validation keywords
+            configuration_: contains the configuration_module.Configuration that enables json schema validation keywords
                 like minItems, minLength etc
 
         Note: double underscores are used here because pycharm thinks that these variables
         are instance properties if they are named normally :(
         """
         __kwargs = cls.__remove_unsets(kwargs)
-        if not _args and not __kwargs:
+        if not args_ and not __kwargs:
             raise TypeError(
                 'No input given. args or kwargs must be given.'
             )
-        if not __kwargs and _args and not isinstance(_args[0], dict):
-            __arg = _args[0]
+        if not __kwargs and args_ and not isinstance(args_[0], dict):
+            __arg = args_[0]
         else:
-            __arg = cls.__get_input_dict(*_args, **__kwargs)
+            __arg = cls.__get_input_dict(*args_, **__kwargs)
         __from_server = False
         __validated_path_to_schemas = {}
         __path_to_type = {}
@@ -1406,12 +1406,12 @@ def __new__(
             __arg, __from_server, __validated_path_to_schemas, ('args[0]',), __path_to_type)
         __validation_metadata = ValidationMetadata(
             path_to_item=('args[0]',),
-            configuration=_configuration or configuration_module.Configuration(),
+            configuration=configuration_ or configuration_module.Configuration(),
             validated_path_to_schemas=frozendict.frozendict(__validated_path_to_schemas)
         )
         __path_to_schemas = cls.__get_new_cls(__arg, __validation_metadata, __path_to_type)
         __new_cls = __path_to_schemas[__validation_metadata.path_to_item]
-        return __new_cls._get_new_instance_without_conversion_oapg(
+        return __new_cls._get_new_instance_without_conversion(
             __arg,
             __validation_metadata.path_to_item,
             __path_to_schemas
@@ -1419,9 +1419,9 @@ def __new__(
 
     def __init__(
         self,
-        *_args: typing.Union[
+        *args_: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
         **kwargs: typing.Union[
             dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
@@ -1732,7 +1732,7 @@ class NoneFrozenDictTupleStrDecimalBoolFileBytesMixin:
 
 
 class BoolBase:
-    def is_true_oapg(self) -> bool:
+    def is_true_(self) -> bool:
         """
         A replacement for x is True
         True if the instance is a BoolClass True Singleton
@@ -1741,7 +1741,7 @@ def is_true_oapg(self) -> bool:
             return False
         return bool(self)
 
-    def is_false_oapg(self) -> bool:
+    def is_false_(self) -> bool:
         """
         A replacement for x is False
         True if the instance is a BoolClass False Singleton
@@ -1752,7 +1752,7 @@ def is_false_oapg(self) -> bool:
 
 
 class NoneBase:
-    def is_none_oapg(self) -> bool:
+    def is_none_(self) -> bool:
         """
         A replacement for x is None
         True if the instance is a NoneClass None Singleton
@@ -1763,47 +1763,47 @@ def is_none_oapg(self) -> bool:
 
 
 class StrBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_str_oapg(self) -> str:
+    def as_str_(self) -> str:
         return self
 
     @property
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         raise Exception('not implemented')
 
     @property
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         raise Exception('not implemented')
 
     @property
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         raise Exception('not implemented')
 
     @property
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         raise Exception('not implemented')
 
 
 class UUIDBase:
     @property
     @functools.lru_cache()
-    def as_uuid_oapg(self) -> uuid.UUID:
+    def as_uuid_(self) -> uuid.UUID:
         return uuid.UUID(self)
 
 
 class DateBase:
     @property
     @functools.lru_cache()
-    def as_date_oapg(self) -> datetime.date:
+    def as_date_(self) -> datetime.date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
 
 class DateTimeBase:
     @property
     @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime.datetime:
+    def as_datetime_(self) -> datetime.datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
 
@@ -1816,15 +1816,15 @@ class DecimalBase:
 
     @property
     @functools.lru_cache()
-    def as_decimal_oapg(self) -> decimal.Decimal:
+    def as_decimal_(self) -> decimal.Decimal:
         return decimal.Decimal(self)
 
 
 class NumberBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -1844,7 +1844,7 @@ def as_int_oapg(self) -> int:
             return self._as_int
 
     @property
-    def as_float_oapg(self) -> float:
+    def as_float_(self) -> float:
         try:
             return self._as_float
         except AttributeError:
@@ -1855,24 +1855,24 @@ def as_float_oapg(self) -> float:
 
 
 class ListBase:
-    MetaOapg: MetaOapgTyped
+    Schema_: SchemaTyped
 
     @classmethod
-    def _get_items_oapg(
+    def _get_items(
         cls: 'Schema',
         arg: typing.List[typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         '''
-        ListBase _get_items_oapg
+        ListBase _get_items
         '''
         cast_items = []
 
         for i, value in enumerate(arg):
             item_path_to_item = path_to_item + (i,)
             item_cls = path_to_schemas[item_path_to_item]
-            new_value = item_cls._get_new_instance_without_conversion_oapg(
+            new_value = item_cls._get_new_instance_without_conversion(
                 value,
                 item_path_to_item,
                 path_to_schemas
@@ -1884,14 +1884,14 @@ def _get_items_oapg(
 
 class DictBase:
     @classmethod
-    def _get_properties_oapg(
+    def _get_properties(
         cls,
         arg: typing.Dict[str, typing.Any],
         path_to_item: typing.Tuple[typing.Union[str, int], ...],
         path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type['Schema']]
     ):
         """
-        DictBase _get_properties_oapg, this is how properties are set
+        DictBase _get_properties, this is how properties are set
         These values already passed validation
         """
         dict_items = {}
@@ -1899,7 +1899,7 @@ def _get_properties_oapg(
         for property_name_js, value in arg.items():
             property_path_to_item = path_to_item + (property_name_js,)
             property_cls = path_to_schemas[property_path_to_item]
-            new_value = property_cls._get_new_instance_without_conversion_oapg(
+            new_value = property_cls._get_new_instance_without_conversion(
                 value,
                 property_path_to_item,
                 path_to_schemas
@@ -1928,7 +1928,7 @@ def __getattr__(self, name: str):
         except KeyError as ex:
             raise AttributeError(str(ex))
 
-    def get_item_oapg(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
+    def get_item_(self, name: str) -> typing.Union['AnyTypeSchema', Unset]:
         # dict_instance[name] accessor
         if not isinstance(self, frozendict.frozendict):
             raise NotImplementedError()
@@ -2085,15 +2085,15 @@ class ListSchema(
     Schema,
     TupleMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {tuple}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.List[typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.List[typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NoneSchema(
@@ -2101,15 +2101,15 @@ class NoneSchema(
     Schema,
     NoneMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {NoneClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: None, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: None, **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: None, **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class NumberSchema(
@@ -2121,20 +2121,20 @@ class NumberSchema(
     This is used for type: number with no format
     Both integers AND floats are accepted
     """
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Union[int, float], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Union[int, float], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class IntBase:
     @property
-    def as_int_oapg(self) -> int:
+    def as_int_(self) -> int:
         try:
             return self._as_int
         except AttributeError:
@@ -2143,22 +2143,22 @@ def as_int_oapg(self) -> int:
 
 
 class IntSchema(IntBase, NumberSchema):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: int, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: int, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class Int32Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int32'
 
@@ -2166,7 +2166,7 @@ class MetaOapg:
 class Int64Schema(
     IntSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'int64'
 
@@ -2174,25 +2174,25 @@ class MetaOapg:
 class Float32Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'float'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class Float64Schema(
     NumberSchema
 ):
-    class MetaOapg:
+    class Schema_:
         types = {decimal.Decimal}
         format = 'double'
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: float, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
 
 class StrSchema(
@@ -2206,50 +2206,50 @@ class StrSchema(
     - type: string (format unset)
     - type: string, format: date
     """
-    class MetaOapg:
+    class Schema_:
         types = {str}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[configuration_module.Configuration] = None) -> 'StrSchema':
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class UUIDSchema(UUIDBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, _arg: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateSchema(DateBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DateTimeSchema(DateTimeBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class DecimalSchema(DecimalBase, StrSchema):
-    class MetaOapg:
+    class Schema_:
         types = {str}
         format = 'number'
 
-    def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
+    def __new__(cls, arg_: str, **kwargs: configuration_module.Configuration):
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2258,7 +2258,7 @@ def __new__(cls, _arg: str, **kwargs: configuration_module.Configuration):
         if one was using it for a StrSchema (where it should be cast to str) or one is using it for NumberSchema
         where it should stay as Decimal.
         """
-        return super().__new__(cls, _arg, **kwargs)
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class BytesSchema(
@@ -2268,11 +2268,11 @@ class BytesSchema(
     """
     this class will subclass bytes and is immutable
     """
-    class MetaOapg:
+    class Schema_:
         types = {bytes}
 
-    def __new__(cls, _arg: bytes, **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: bytes, **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class FileSchema(
@@ -2295,18 +2295,18 @@ class FileSchema(
     - to allow file reading and writing to disk
     - to be able to preserve file name info
     """
-    class MetaOapg:
+    class Schema_:
         types = {FileIO}
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
-        return super(Schema, cls).__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: configuration_module.Configuration):
+        return super(Schema, cls).__new__(cls, arg_)
 
 
 class BinarySchema(
     Schema,
     BinaryMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {FileIO, bytes}
         format = 'binary'
 
@@ -2316,8 +2316,8 @@ class OneOf:
                 FileSchema,
             ]
 
-    def __new__(cls, _arg: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
-        return super().__new__(cls, _arg)
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: configuration_module.Configuration):
+        return super().__new__(cls, arg_)
 
 
 class BoolSchema(
@@ -2325,15 +2325,15 @@ class BoolSchema(
     Schema,
     BoolMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {BoolClass}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: bool, _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: bool, configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, _arg: bool, **kwargs: ValidationMetadata):
-        return super().__new__(cls, _arg, **kwargs)
+    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata):
+        return super().__new__(cls, arg_, **kwargs)
 
 
 class AnyTypeSchema(
@@ -2347,7 +2347,7 @@ class AnyTypeSchema(
     NoneFrozenDictTupleStrDecimalBoolFileBytesMixin
 ):
     # Python representation of a schema defined as true or {}
-    class MetaOapg:
+    class Schema_:
         pass
 
 
@@ -2363,18 +2363,18 @@ class NotAnyTypeSchema(AnyTypeSchema):
     Note: validations on this class are never run because the code knows that no inputs will ever validate
     """
 
-    class MetaOapg:
+    class Schema_:
         _not = AnyTypeSchema
 
     def __new__(
         cls,
-        *_args,
-        _configuration: typing.Optional[configuration_module.Configuration] = None,
+        *args_,
+        configuration_: typing.Optional[configuration_module.Configuration] = None,
     ) -> 'NotAnyTypeSchema':
         return super().__new__(
             cls,
-            *_args,
-            _configuration=_configuration,
+            *args_,
+            configuration_=configuration_,
         )
 
 
@@ -2383,15 +2383,15 @@ class DictSchema(
     Schema,
     FrozenDictMixin
 ):
-    class MetaOapg:
+    class Schema_:
         types = {frozendict.frozendict}
 
     @classmethod
-    def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[configuration_module.Configuration] = None):
-        return super().from_openapi_data_oapg(arg, _configuration=_configuration)
+    def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[configuration_module.Configuration] = None):
+        return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *_args: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
-        return super().__new__(cls, *_args, **kwargs)
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
+        return super().__new__(cls, *args_, **kwargs)
 
 
 schema_type_classes = {NoneSchema, DictSchema, ListSchema, NumberSchema, StrSchema, BoolSchema, AnyTypeSchema}
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test__200_response.py b/samples/openapi3/client/petstore/python/test/components/schema/test__200_response.py
index dbf0ae3b408..deb2f94830c 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test__200_response.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test__200_response.py
@@ -18,7 +18,7 @@
 
 class Test_200Response(unittest.TestCase):
     """_200Response unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test__return.py b/samples/openapi3/client/petstore/python/test/components/schema/test__return.py
index f568447fc71..8fa9ceb0498 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test__return.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test__return.py
@@ -18,7 +18,7 @@
 
 class Test_Return(unittest.TestCase):
     """_Return unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_abstract_step_message.py b/samples/openapi3/client/petstore/python/test/components/schema/test_abstract_step_message.py
index 7daba93f8a8..ea28523253d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_abstract_step_message.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_abstract_step_message.py
@@ -18,7 +18,7 @@
 
 class TestAbstractStepMessage(unittest.TestCase):
     """AbstractStepMessage unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_class.py b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_class.py
index 8aa09106708..de0ce1ec765 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_class.py
@@ -18,7 +18,7 @@
 
 class TestAdditionalPropertiesClass(unittest.TestCase):
     """AdditionalPropertiesClass unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_validator.py b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_validator.py
index f1ec27f7a68..0ec955e3cf8 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_validator.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_validator.py
@@ -18,7 +18,7 @@
 
 class TestAdditionalPropertiesValidator(unittest.TestCase):
     """AdditionalPropertiesValidator unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_with_array_of_enums.py b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_with_array_of_enums.py
index ebacf6f2566..29b2fc99908 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_with_array_of_enums.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_additional_properties_with_array_of_enums.py
@@ -18,7 +18,7 @@
 
 class TestAdditionalPropertiesWithArrayOfEnums(unittest.TestCase):
     """AdditionalPropertiesWithArrayOfEnums unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_address.py b/samples/openapi3/client/petstore/python/test/components/schema/test_address.py
index aa3b444923c..d55177c635d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_address.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_address.py
@@ -18,7 +18,7 @@
 
 class TestAddress(unittest.TestCase):
     """Address unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_animal.py b/samples/openapi3/client/petstore/python/test/components/schema/test_animal.py
index 02b0b28c776..350231586f6 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_animal.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_animal.py
@@ -18,7 +18,7 @@
 
 class TestAnimal(unittest.TestCase):
     """Animal unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_animal_farm.py b/samples/openapi3/client/petstore/python/test/components/schema/test_animal_farm.py
index c81ee608560..88dfc51af01 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_animal_farm.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_animal_farm.py
@@ -18,7 +18,7 @@
 
 class TestAnimalFarm(unittest.TestCase):
     """AnimalFarm unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_and_format.py b/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_and_format.py
index 312389fdcee..69b1574bdf7 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_and_format.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_and_format.py
@@ -18,7 +18,7 @@
 
 class TestAnyTypeAndFormat(unittest.TestCase):
     """AnyTypeAndFormat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_not_string.py b/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_not_string.py
index b8392bdc42f..47982eb372f 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_not_string.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_any_type_not_string.py
@@ -18,7 +18,7 @@
 
 class TestAnyTypeNotString(unittest.TestCase):
     """AnyTypeNotString unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_api_response.py b/samples/openapi3/client/petstore/python/test/components/schema/test_api_response.py
index 09b2c9e8dfc..c03921bb881 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_api_response.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_api_response.py
@@ -18,7 +18,7 @@
 
 class TestApiResponse(unittest.TestCase):
     """ApiResponse unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_apple.py b/samples/openapi3/client/petstore/python/test/components/schema/test_apple.py
index 3662d1e2aee..6ce6365fa5b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_apple.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_apple.py
@@ -18,7 +18,7 @@
 
 class TestApple(unittest.TestCase):
     """Apple unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_apple_req.py b/samples/openapi3/client/petstore/python/test/components/schema/test_apple_req.py
index a8709008fa3..87d4d9c6133 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_apple_req.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_apple_req.py
@@ -18,7 +18,7 @@
 
 class TestAppleReq(unittest.TestCase):
     """AppleReq unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_holding_any_type.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_holding_any_type.py
index dc453e72a83..a7d32b13123 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_holding_any_type.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_holding_any_type.py
@@ -18,7 +18,7 @@
 
 class TestArrayHoldingAnyType(unittest.TestCase):
     """ArrayHoldingAnyType unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_array_of_number_only.py
index 1170d7bbc2b..1e0e42e91f8 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_array_of_number_only.py
@@ -18,7 +18,7 @@
 
 class TestArrayOfArrayOfNumberOnly(unittest.TestCase):
     """ArrayOfArrayOfNumberOnly unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_enums.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_enums.py
index 595474d7a1a..ffa2f888e63 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_enums.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_enums.py
@@ -18,7 +18,7 @@
 
 class TestArrayOfEnums(unittest.TestCase):
     """ArrayOfEnums unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_number_only.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_number_only.py
index f538c7eb0fe..ccab096fb2a 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_of_number_only.py
@@ -18,7 +18,7 @@
 
 class TestArrayOfNumberOnly(unittest.TestCase):
     """ArrayOfNumberOnly unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_test.py
index 3d74d16746f..457cc528dcf 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_test.py
@@ -18,7 +18,7 @@
 
 class TestArrayTest(unittest.TestCase):
     """ArrayTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_array_with_validations_in_items.py b/samples/openapi3/client/petstore/python/test/components/schema/test_array_with_validations_in_items.py
index b3fbd82f6a1..787db54b415 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_array_with_validations_in_items.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_array_with_validations_in_items.py
@@ -18,7 +18,7 @@
 
 class TestArrayWithValidationsInItems(unittest.TestCase):
     """ArrayWithValidationsInItems unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_banana.py b/samples/openapi3/client/petstore/python/test/components/schema/test_banana.py
index dcbfbfc2d48..43bfd68daaf 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_banana.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_banana.py
@@ -18,7 +18,7 @@
 
 class TestBanana(unittest.TestCase):
     """Banana unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_banana_req.py b/samples/openapi3/client/petstore/python/test/components/schema/test_banana_req.py
index 508ef000715..86df3cb5c18 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_banana_req.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_banana_req.py
@@ -18,7 +18,7 @@
 
 class TestBananaReq(unittest.TestCase):
     """BananaReq unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_bar.py b/samples/openapi3/client/petstore/python/test/components/schema/test_bar.py
index 4c583f22c2c..3bbf5cd213d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_bar.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_bar.py
@@ -18,7 +18,7 @@
 
 class TestBar(unittest.TestCase):
     """Bar unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_basque_pig.py b/samples/openapi3/client/petstore/python/test/components/schema/test_basque_pig.py
index 1da70dbe0b1..d5d37d39497 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_basque_pig.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_basque_pig.py
@@ -18,7 +18,7 @@
 
 class TestBasquePig(unittest.TestCase):
     """BasquePig unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_boolean.py b/samples/openapi3/client/petstore/python/test/components/schema/test_boolean.py
index e0e2048d72c..ee781769cde 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_boolean.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_boolean.py
@@ -18,7 +18,7 @@
 
 class TestBoolean(unittest.TestCase):
     """Boolean unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_boolean_enum.py b/samples/openapi3/client/petstore/python/test/components/schema/test_boolean_enum.py
index 1509659f4f8..2899e6b7868 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_boolean_enum.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_boolean_enum.py
@@ -18,7 +18,7 @@
 
 class TestBooleanEnum(unittest.TestCase):
     """BooleanEnum unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_capitalization.py b/samples/openapi3/client/petstore/python/test/components/schema/test_capitalization.py
index f3873a5f6d5..6b677687e29 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_capitalization.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_capitalization.py
@@ -18,7 +18,7 @@
 
 class TestCapitalization(unittest.TestCase):
     """Capitalization unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_cat.py b/samples/openapi3/client/petstore/python/test/components/schema/test_cat.py
index 2356ee93d36..a965c063a3c 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_cat.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_cat.py
@@ -18,7 +18,7 @@
 
 class TestCat(unittest.TestCase):
     """Cat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_category.py b/samples/openapi3/client/petstore/python/test/components/schema/test_category.py
index 0bdb489d0bb..016432e14b6 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_category.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_category.py
@@ -18,7 +18,7 @@
 
 class TestCategory(unittest.TestCase):
     """Category unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_child_cat.py b/samples/openapi3/client/petstore/python/test/components/schema/test_child_cat.py
index c7f781d5cd3..97397ce9684 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_child_cat.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_child_cat.py
@@ -18,7 +18,7 @@
 
 class TestChildCat(unittest.TestCase):
     """ChildCat unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_class_model.py b/samples/openapi3/client/petstore/python/test/components/schema/test_class_model.py
index c3323c671b0..b3da5a4f451 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_class_model.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_class_model.py
@@ -18,7 +18,7 @@
 
 class TestClassModel(unittest.TestCase):
     """ClassModel unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_client.py b/samples/openapi3/client/petstore/python/test/components/schema/test_client.py
index 723dfd34d6c..6180542faf3 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_client.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_client.py
@@ -18,7 +18,7 @@
 
 class TestClient(unittest.TestCase):
     """Client unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_complex_quadrilateral.py b/samples/openapi3/client/petstore/python/test/components/schema/test_complex_quadrilateral.py
index 7bc5faf4f32..794c4c269d0 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_complex_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_complex_quadrilateral.py
@@ -18,7 +18,7 @@
 
 class TestComplexQuadrilateral(unittest.TestCase):
     """ComplexQuadrilateral unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_any_of_different_types_no_validations.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_any_of_different_types_no_validations.py
index bd0605c1943..88113c6cb51 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_any_of_different_types_no_validations.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_any_of_different_types_no_validations.py
@@ -18,7 +18,7 @@
 
 class TestComposedAnyOfDifferentTypesNoValidations(unittest.TestCase):
     """ComposedAnyOfDifferentTypesNoValidations unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_array.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_array.py
index 95b9c6230ba..167481df527 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_array.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_array.py
@@ -18,7 +18,7 @@
 
 class TestComposedArray(unittest.TestCase):
     """ComposedArray unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_bool.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_bool.py
index 1c38e60b7a3..8493cafdba5 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_bool.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_bool.py
@@ -18,7 +18,7 @@
 
 class TestComposedBool(unittest.TestCase):
     """ComposedBool unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_none.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_none.py
index 279e44b258a..0a103e94271 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_none.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_none.py
@@ -18,7 +18,7 @@
 
 class TestComposedNone(unittest.TestCase):
     """ComposedNone unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_number.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_number.py
index 84519b919a9..200db8e4414 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_number.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_number.py
@@ -18,7 +18,7 @@
 
 class TestComposedNumber(unittest.TestCase):
     """ComposedNumber unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_object.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_object.py
index ab3ad73a628..83062a12636 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_object.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_object.py
@@ -18,7 +18,7 @@
 
 class TestComposedObject(unittest.TestCase):
     """ComposedObject unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_one_of_different_types.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_one_of_different_types.py
index 49a0483e30c..e2dab67828c 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_one_of_different_types.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_one_of_different_types.py
@@ -18,7 +18,7 @@
 
 class TestComposedOneOfDifferentTypes(unittest.TestCase):
     """ComposedOneOfDifferentTypes unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_string.py b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_string.py
index 83b45c26226..2c140dcec68 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_composed_string.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_composed_string.py
@@ -18,7 +18,7 @@
 
 class TestComposedString(unittest.TestCase):
     """ComposedString unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_currency.py b/samples/openapi3/client/petstore/python/test/components/schema/test_currency.py
index 515f156bb46..c945ca412fd 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_currency.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_currency.py
@@ -18,7 +18,7 @@
 
 class TestCurrency(unittest.TestCase):
     """Currency unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_danish_pig.py b/samples/openapi3/client/petstore/python/test/components/schema/test_danish_pig.py
index f66f2e0af27..fa769174910 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_danish_pig.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_danish_pig.py
@@ -18,7 +18,7 @@
 
 class TestDanishPig(unittest.TestCase):
     """DanishPig unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_test.py
index 4979d3f1724..6367350816f 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_test.py
@@ -18,7 +18,7 @@
 
 class TestDateTimeTest(unittest.TestCase):
     """DateTimeTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_with_validations.py b/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_with_validations.py
index 5cdc679472b..1ac6a9be494 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_with_validations.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_date_time_with_validations.py
@@ -18,7 +18,7 @@
 
 class TestDateTimeWithValidations(unittest.TestCase):
     """DateTimeWithValidations unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_date_with_validations.py b/samples/openapi3/client/petstore/python/test/components/schema/test_date_with_validations.py
index cfab4f00713..513ec01586f 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_date_with_validations.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_date_with_validations.py
@@ -18,7 +18,7 @@
 
 class TestDateWithValidations(unittest.TestCase):
     """DateWithValidations unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_decimal_payload.py b/samples/openapi3/client/petstore/python/test/components/schema/test_decimal_payload.py
index 870c95061a6..1ce1d489eaf 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_decimal_payload.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_decimal_payload.py
@@ -18,7 +18,7 @@
 
 class TestDecimalPayload(unittest.TestCase):
     """DecimalPayload unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_dog.py b/samples/openapi3/client/petstore/python/test/components/schema/test_dog.py
index f30d06c8439..c6410ad1260 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_dog.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_dog.py
@@ -18,7 +18,7 @@
 
 class TestDog(unittest.TestCase):
     """Dog unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_drawing.py b/samples/openapi3/client/petstore/python/test/components/schema/test_drawing.py
index 31fe628596b..7324969b5d0 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_drawing.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_drawing.py
@@ -18,7 +18,7 @@
 
 class TestDrawing(unittest.TestCase):
     """Drawing unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_arrays.py b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_arrays.py
index b44ecaca694..61b576f2bae 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_arrays.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_arrays.py
@@ -18,7 +18,7 @@
 
 class TestEnumArrays(unittest.TestCase):
     """EnumArrays unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_class.py b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_class.py
index b5019034b60..abe05a6ed64 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_class.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_class.py
@@ -18,7 +18,7 @@
 
 class TestEnumClass(unittest.TestCase):
     """EnumClass unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_test.py
index e13c90df04d..ecd8cfa1ada 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_enum_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_enum_test.py
@@ -18,7 +18,7 @@
 
 class TestEnumTest(unittest.TestCase):
     """EnumTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_equilateral_triangle.py b/samples/openapi3/client/petstore/python/test/components/schema/test_equilateral_triangle.py
index a017d0a5ea2..3ba85c637e4 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_equilateral_triangle.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_equilateral_triangle.py
@@ -18,7 +18,7 @@
 
 class TestEquilateralTriangle(unittest.TestCase):
     """EquilateralTriangle unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_file.py b/samples/openapi3/client/petstore/python/test/components/schema/test_file.py
index dd610b6b7f6..1f1bc243698 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_file.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_file.py
@@ -18,7 +18,7 @@
 
 class TestFile(unittest.TestCase):
     """File unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_file_schema_test_class.py b/samples/openapi3/client/petstore/python/test/components/schema/test_file_schema_test_class.py
index aeef3d815a1..8745ba5fcc2 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_file_schema_test_class.py
@@ -18,7 +18,7 @@
 
 class TestFileSchemaTestClass(unittest.TestCase):
     """FileSchemaTestClass unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_foo.py b/samples/openapi3/client/petstore/python/test/components/schema/test_foo.py
index 42a074eb2f5..1068b170825 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_foo.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_foo.py
@@ -18,7 +18,7 @@
 
 class TestFoo(unittest.TestCase):
     """Foo unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_format_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_format_test.py
index 1f7154c23cc..718ca9798d8 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_format_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_format_test.py
@@ -18,7 +18,7 @@
 
 class TestFormatTest(unittest.TestCase):
     """FormatTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_from_schema.py b/samples/openapi3/client/petstore/python/test/components/schema/test_from_schema.py
index 8f38981ced3..7bd6216d980 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_from_schema.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_from_schema.py
@@ -18,7 +18,7 @@
 
 class TestFromSchema(unittest.TestCase):
     """FromSchema unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_fruit.py b/samples/openapi3/client/petstore/python/test/components/schema/test_fruit.py
index 6898cbdbde3..5edef25fc35 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_fruit.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_fruit.py
@@ -18,7 +18,7 @@
 
 class TestFruit(unittest.TestCase):
     """Fruit unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_fruit_req.py b/samples/openapi3/client/petstore/python/test/components/schema/test_fruit_req.py
index 8f170b0e371..b33d9b062b0 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_fruit_req.py
@@ -18,7 +18,7 @@
 
 class TestFruitReq(unittest.TestCase):
     """FruitReq unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_gm_fruit.py b/samples/openapi3/client/petstore/python/test/components/schema/test_gm_fruit.py
index 0629c5c7fe6..4b6a114e7c9 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_gm_fruit.py
@@ -18,7 +18,7 @@
 
 class TestGmFruit(unittest.TestCase):
     """GmFruit unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_grandparent_animal.py b/samples/openapi3/client/petstore/python/test/components/schema/test_grandparent_animal.py
index 1ff81b7d942..4a5893ec5b5 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_grandparent_animal.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_grandparent_animal.py
@@ -18,7 +18,7 @@
 
 class TestGrandparentAnimal(unittest.TestCase):
     """GrandparentAnimal unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_has_only_read_only.py b/samples/openapi3/client/petstore/python/test/components/schema/test_has_only_read_only.py
index aeee8e7e0f3..2340b8d5e29 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_has_only_read_only.py
@@ -18,7 +18,7 @@
 
 class TestHasOnlyReadOnly(unittest.TestCase):
     """HasOnlyReadOnly unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_health_check_result.py b/samples/openapi3/client/petstore/python/test/components/schema/test_health_check_result.py
index 6cffea38e63..455a67caf18 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_health_check_result.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_health_check_result.py
@@ -18,7 +18,7 @@
 
 class TestHealthCheckResult(unittest.TestCase):
     """HealthCheckResult unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum.py
index 126d4b980c1..91243f73dca 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum.py
@@ -18,7 +18,7 @@
 
 class TestIntegerEnum(unittest.TestCase):
     """IntegerEnum unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_big.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_big.py
index b56d3a85fd3..f8ff435014d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_big.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_big.py
@@ -18,7 +18,7 @@
 
 class TestIntegerEnumBig(unittest.TestCase):
     """IntegerEnumBig unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_one_value.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_one_value.py
index ba41c9ea341..cadac70f52d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_one_value.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_one_value.py
@@ -18,7 +18,7 @@
 
 class TestIntegerEnumOneValue(unittest.TestCase):
     """IntegerEnumOneValue unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_with_default_value.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_with_default_value.py
index 7a9bd46f6c5..ea32c163bc6 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_enum_with_default_value.py
@@ -18,7 +18,7 @@
 
 class TestIntegerEnumWithDefaultValue(unittest.TestCase):
     """IntegerEnumWithDefaultValue unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_max10.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_max10.py
index cf3001d643a..a3d7411dbd8 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_max10.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_max10.py
@@ -18,7 +18,7 @@
 
 class TestIntegerMax10(unittest.TestCase):
     """IntegerMax10 unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_min15.py b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_min15.py
index e7639c72d76..e166e5ba45b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_integer_min15.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_integer_min15.py
@@ -18,7 +18,7 @@
 
 class TestIntegerMin15(unittest.TestCase):
     """IntegerMin15 unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_isosceles_triangle.py b/samples/openapi3/client/petstore/python/test/components/schema/test_isosceles_triangle.py
index 1e39b2cd02c..d49705e691a 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_isosceles_triangle.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_isosceles_triangle.py
@@ -18,7 +18,7 @@
 
 class TestIsoscelesTriangle(unittest.TestCase):
     """IsoscelesTriangle unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request.py b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request.py
index 83a3196d66b..cac008ff3e7 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request.py
@@ -18,7 +18,7 @@
 
 class TestJSONPatchRequest(unittest.TestCase):
     """JSONPatchRequest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_add_replace_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_add_replace_test.py
index 20227e4b64b..7533d170f2b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_add_replace_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_add_replace_test.py
@@ -18,7 +18,7 @@
 
 class TestJSONPatchRequestAddReplaceTest(unittest.TestCase):
     """JSONPatchRequestAddReplaceTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_move_copy.py b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_move_copy.py
index e5382437cc0..3797d7478e2 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_move_copy.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_move_copy.py
@@ -18,7 +18,7 @@
 
 class TestJSONPatchRequestMoveCopy(unittest.TestCase):
     """JSONPatchRequestMoveCopy unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_remove.py b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_remove.py
index e0e7ce7d034..2bbb7f6fcea 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_remove.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_json_patch_request_remove.py
@@ -18,7 +18,7 @@
 
 class TestJSONPatchRequestRemove(unittest.TestCase):
     """JSONPatchRequestRemove unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_mammal.py b/samples/openapi3/client/petstore/python/test/components/schema/test_mammal.py
index e6139351be3..7894605344a 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_mammal.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_mammal.py
@@ -18,7 +18,7 @@
 
 class TestMammal(unittest.TestCase):
     """Mammal unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_map_test.py b/samples/openapi3/client/petstore/python/test/components/schema/test_map_test.py
index 3d613b722f5..fed1e79ef71 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_map_test.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_map_test.py
@@ -18,7 +18,7 @@
 
 class TestMapTest(unittest.TestCase):
     """MapTest unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python/test/components/schema/test_mixed_properties_and_additional_properties_class.py
index fc2364b3ba6..2205bda8ba6 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_mixed_properties_and_additional_properties_class.py
@@ -18,7 +18,7 @@
 
 class TestMixedPropertiesAndAdditionalPropertiesClass(unittest.TestCase):
     """MixedPropertiesAndAdditionalPropertiesClass unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_money.py b/samples/openapi3/client/petstore/python/test/components/schema/test_money.py
index c714cd3f071..3fb2d7d9608 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_money.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_money.py
@@ -18,7 +18,7 @@
 
 class TestMoney(unittest.TestCase):
     """Money unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_name.py b/samples/openapi3/client/petstore/python/test/components/schema/test_name.py
index 2528d3de6d1..a06892840be 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_name.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_name.py
@@ -18,7 +18,7 @@
 
 class TestName(unittest.TestCase):
     """Name unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_no_additional_properties.py b/samples/openapi3/client/petstore/python/test/components/schema/test_no_additional_properties.py
index fa33821fd1e..96ea8eb23da 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_no_additional_properties.py
@@ -18,7 +18,7 @@
 
 class TestNoAdditionalProperties(unittest.TestCase):
     """NoAdditionalProperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_class.py b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_class.py
index 131c65d796f..3d97a3ff04b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_class.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_class.py
@@ -18,7 +18,7 @@
 
 class TestNullableClass(unittest.TestCase):
     """NullableClass unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_shape.py b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_shape.py
index 4c0aec52f2c..57b7c8cd85c 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_shape.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_shape.py
@@ -18,7 +18,7 @@
 
 class TestNullableShape(unittest.TestCase):
     """NullableShape unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_string.py b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_string.py
index fe75a05dfff..ee6cb683512 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_string.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_nullable_string.py
@@ -18,7 +18,7 @@
 
 class TestNullableString(unittest.TestCase):
     """NullableString unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_number.py b/samples/openapi3/client/petstore/python/test/components/schema/test_number.py
index 635bf94b01b..c89510b2fe4 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_number.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_number.py
@@ -18,7 +18,7 @@
 
 class TestNumber(unittest.TestCase):
     """Number unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_number_only.py b/samples/openapi3/client/petstore/python/test/components/schema/test_number_only.py
index 7ab3095e52d..ca244d6f109 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_number_only.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_number_only.py
@@ -18,7 +18,7 @@
 
 class TestNumberOnly(unittest.TestCase):
     """NumberOnly unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_number_with_validations.py b/samples/openapi3/client/petstore/python/test/components/schema/test_number_with_validations.py
index 691fd5fb799..64af8c8ee64 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_number_with_validations.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_number_with_validations.py
@@ -18,7 +18,7 @@
 
 class TestNumberWithValidations(unittest.TestCase):
     """NumberWithValidations unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_interface.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_interface.py
index 538b94fa113..e43d79ac108 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_interface.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_interface.py
@@ -18,7 +18,7 @@
 
 class TestObjectInterface(unittest.TestCase):
     """ObjectInterface unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_arg_and_args_properties.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_arg_and_args_properties.py
index 80ea275f951..3ae3bb9bddf 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_arg_and_args_properties.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_arg_and_args_properties.py
@@ -18,7 +18,7 @@
 
 class TestObjectModelWithArgAndArgsProperties(unittest.TestCase):
     """ObjectModelWithArgAndArgsProperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_ref_props.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_ref_props.py
index 75f6583793a..e5289bebc11 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_model_with_ref_props.py
@@ -18,7 +18,7 @@
 
 class TestObjectModelWithRefProps(unittest.TestCase):
     """ObjectModelWithRefProps unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
index d2da2132ed1..3875e8bb107 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_all_of_with_req_test_prop_from_unset_add_prop.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithAllOfWithReqTestPropFromUnsetAddProp(unittest.TestCase):
     """ObjectWithAllOfWithReqTestPropFromUnsetAddProp unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_decimal_properties.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_decimal_properties.py
index da11142371d..6d7b55974c6 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_decimal_properties.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_decimal_properties.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithDecimalProperties(unittest.TestCase):
     """ObjectWithDecimalProperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_difficultly_named_props.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_difficultly_named_props.py
index 12714bd8309..84b3dd37592 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_difficultly_named_props.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_difficultly_named_props.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithDifficultlyNamedProps(unittest.TestCase):
     """ObjectWithDifficultlyNamedProps unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_inline_composition_property.py
index 4a9759281c0..dfe26002ad0 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_inline_composition_property.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_inline_composition_property.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithInlineCompositionProperty(unittest.TestCase):
     """ObjectWithInlineCompositionProperty unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_invalid_named_refed_properties.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_invalid_named_refed_properties.py
index 941fdb58d0c..8e5fc89ea0e 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_invalid_named_refed_properties.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_invalid_named_refed_properties.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithInvalidNamedRefedProperties(unittest.TestCase):
     """ObjectWithInvalidNamedRefedProperties unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_optional_test_prop.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_optional_test_prop.py
index 8da69416663..6ebc4ea6938 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_optional_test_prop.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_optional_test_prop.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithOptionalTestProp(unittest.TestCase):
     """ObjectWithOptionalTestProp unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_validations.py b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_validations.py
index c2a32b31ab1..0cb73c465ed 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_validations.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_object_with_validations.py
@@ -18,7 +18,7 @@
 
 class TestObjectWithValidations(unittest.TestCase):
     """ObjectWithValidations unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_order.py b/samples/openapi3/client/petstore/python/test/components/schema/test_order.py
index 16e105fb98d..6309f746a48 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_order.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_order.py
@@ -18,7 +18,7 @@
 
 class TestOrder(unittest.TestCase):
     """Order unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_parent_pet.py b/samples/openapi3/client/petstore/python/test/components/schema/test_parent_pet.py
index cd59bd34bc4..b588af3dce4 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_parent_pet.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_parent_pet.py
@@ -18,7 +18,7 @@
 
 class TestParentPet(unittest.TestCase):
     """ParentPet unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_pet.py b/samples/openapi3/client/petstore/python/test/components/schema/test_pet.py
index e80a51e38c1..b7c0e80b19f 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_pet.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_pet.py
@@ -18,7 +18,7 @@
 
 class TestPet(unittest.TestCase):
     """Pet unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_pig.py b/samples/openapi3/client/petstore/python/test/components/schema/test_pig.py
index 8305491ba38..95f4a8ce616 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_pig.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_pig.py
@@ -18,7 +18,7 @@
 
 class TestPig(unittest.TestCase):
     """Pig unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_player.py b/samples/openapi3/client/petstore/python/test/components/schema/test_player.py
index 3cea2f7fcf7..0f52b5aab44 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_player.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_player.py
@@ -18,7 +18,7 @@
 
 class TestPlayer(unittest.TestCase):
     """Player unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral.py b/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral.py
index bd0df64b143..2c6ae118061 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral.py
@@ -18,7 +18,7 @@
 
 class TestQuadrilateral(unittest.TestCase):
     """Quadrilateral unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral_interface.py b/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral_interface.py
index 579a02747de..70458703e45 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral_interface.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_quadrilateral_interface.py
@@ -18,7 +18,7 @@
 
 class TestQuadrilateralInterface(unittest.TestCase):
     """QuadrilateralInterface unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_read_only_first.py b/samples/openapi3/client/petstore/python/test/components/schema/test_read_only_first.py
index 2b8f9ec8866..f60b345e420 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_read_only_first.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_read_only_first.py
@@ -18,7 +18,7 @@
 
 class TestReadOnlyFirst(unittest.TestCase):
     """ReadOnlyFirst unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_explicit_add_props.py b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_explicit_add_props.py
index a4c114c67d4..96c97fc5afa 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_explicit_add_props.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_explicit_add_props.py
@@ -18,7 +18,7 @@
 
 class TestReqPropsFromExplicitAddProps(unittest.TestCase):
     """ReqPropsFromExplicitAddProps unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_true_add_props.py b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_true_add_props.py
index 1f57865c0e9..c1817221f8a 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_true_add_props.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_true_add_props.py
@@ -18,7 +18,7 @@
 
 class TestReqPropsFromTrueAddProps(unittest.TestCase):
     """ReqPropsFromTrueAddProps unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_unset_add_props.py b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_unset_add_props.py
index ab3289ecb73..d62d2ceb709 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_unset_add_props.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_req_props_from_unset_add_props.py
@@ -18,7 +18,7 @@
 
 class TestReqPropsFromUnsetAddProps(unittest.TestCase):
     """ReqPropsFromUnsetAddProps unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_scalene_triangle.py b/samples/openapi3/client/petstore/python/test/components/schema/test_scalene_triangle.py
index c1d5563ff49..97e483721db 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_scalene_triangle.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_scalene_triangle.py
@@ -18,7 +18,7 @@
 
 class TestScaleneTriangle(unittest.TestCase):
     """ScaleneTriangle unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_array_model.py b/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_array_model.py
index 0362a2505e5..d5860134a37 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_array_model.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_array_model.py
@@ -18,7 +18,7 @@
 
 class TestSelfReferencingArrayModel(unittest.TestCase):
     """SelfReferencingArrayModel unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_object_model.py b/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_object_model.py
index 8e2f2e6c76f..70dccf29c07 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_object_model.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_self_referencing_object_model.py
@@ -18,7 +18,7 @@
 
 class TestSelfReferencingObjectModel(unittest.TestCase):
     """SelfReferencingObjectModel unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_shape.py b/samples/openapi3/client/petstore/python/test/components/schema/test_shape.py
index f1d6498d9e6..ba3193d8650 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_shape.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_shape.py
@@ -18,7 +18,7 @@
 
 class TestShape(unittest.TestCase):
     """Shape unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_shape_or_null.py b/samples/openapi3/client/petstore/python/test/components/schema/test_shape_or_null.py
index 5c070603dde..40da516a99b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_shape_or_null.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_shape_or_null.py
@@ -18,7 +18,7 @@
 
 class TestShapeOrNull(unittest.TestCase):
     """ShapeOrNull unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_simple_quadrilateral.py b/samples/openapi3/client/petstore/python/test/components/schema/test_simple_quadrilateral.py
index 491b3199a27..6c8685411e1 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_simple_quadrilateral.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_simple_quadrilateral.py
@@ -18,7 +18,7 @@
 
 class TestSimpleQuadrilateral(unittest.TestCase):
     """SimpleQuadrilateral unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_some_object.py b/samples/openapi3/client/petstore/python/test/components/schema/test_some_object.py
index cd3924eb896..391c8516f1c 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_some_object.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_some_object.py
@@ -18,7 +18,7 @@
 
 class TestSomeObject(unittest.TestCase):
     """SomeObject unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_special_model_name.py b/samples/openapi3/client/petstore/python/test/components/schema/test_special_model_name.py
index 33a3ab307d5..c6ebe917b13 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_special_model_name.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_special_model_name.py
@@ -18,7 +18,7 @@
 
 class TestSpecialModelName(unittest.TestCase):
     """SpecialModelName unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_string.py b/samples/openapi3/client/petstore/python/test/components/schema/test_string.py
index 31e1c2a1a88..5f377adedf0 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_string.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_string.py
@@ -18,7 +18,7 @@
 
 class TestString(unittest.TestCase):
     """String unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_string_boolean_map.py b/samples/openapi3/client/petstore/python/test/components/schema/test_string_boolean_map.py
index dc662a16980..8e1912bc824 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_string_boolean_map.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_string_boolean_map.py
@@ -18,7 +18,7 @@
 
 class TestStringBooleanMap(unittest.TestCase):
     """StringBooleanMap unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum.py b/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum.py
index e17bc3a0ef6..8df265feda4 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum.py
@@ -18,7 +18,7 @@
 
 class TestStringEnum(unittest.TestCase):
     """StringEnum unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum_with_default_value.py b/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum_with_default_value.py
index ff82ef6b7a9..07e1004768d 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum_with_default_value.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_string_enum_with_default_value.py
@@ -18,7 +18,7 @@
 
 class TestStringEnumWithDefaultValue(unittest.TestCase):
     """StringEnumWithDefaultValue unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_string_with_validation.py b/samples/openapi3/client/petstore/python/test/components/schema/test_string_with_validation.py
index db4ed01ca72..d50a1d48d8b 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_string_with_validation.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_string_with_validation.py
@@ -18,7 +18,7 @@
 
 class TestStringWithValidation(unittest.TestCase):
     """StringWithValidation unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_tag.py b/samples/openapi3/client/petstore/python/test/components/schema/test_tag.py
index f33a75587eb..a13d8566eac 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_tag.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_tag.py
@@ -18,7 +18,7 @@
 
 class TestTag(unittest.TestCase):
     """Tag unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_triangle.py b/samples/openapi3/client/petstore/python/test/components/schema/test_triangle.py
index d1834fa382e..83d7197de67 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_triangle.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_triangle.py
@@ -18,7 +18,7 @@
 
 class TestTriangle(unittest.TestCase):
     """Triangle unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_triangle_interface.py b/samples/openapi3/client/petstore/python/test/components/schema/test_triangle_interface.py
index e2dd99318ae..4b522f4fb50 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_triangle_interface.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_triangle_interface.py
@@ -18,7 +18,7 @@
 
 class TestTriangleInterface(unittest.TestCase):
     """TriangleInterface unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_user.py b/samples/openapi3/client/petstore/python/test/components/schema/test_user.py
index 4eb5097f44f..a22f5026b91 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_user.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_user.py
@@ -18,7 +18,7 @@
 
 class TestUser(unittest.TestCase):
     """User unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_uuid_string.py b/samples/openapi3/client/petstore/python/test/components/schema/test_uuid_string.py
index 1356e156ea4..50960cfd0be 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_uuid_string.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_uuid_string.py
@@ -18,7 +18,7 @@
 
 class TestUUIDString(unittest.TestCase):
     """UUIDString unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_whale.py b/samples/openapi3/client/petstore/python/test/components/schema/test_whale.py
index bd860a01602..16b4012def8 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_whale.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_whale.py
@@ -18,7 +18,7 @@
 
 class TestWhale(unittest.TestCase):
     """Whale unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/components/schema/test_zebra.py b/samples/openapi3/client/petstore/python/test/components/schema/test_zebra.py
index d53a83960ae..d63048b5d14 100644
--- a/samples/openapi3/client/petstore/python/test/components/schema/test_zebra.py
+++ b/samples/openapi3/client/petstore/python/test/components/schema/test_zebra.py
@@ -18,7 +18,7 @@
 
 class TestZebra(unittest.TestCase):
     """Zebra unit test stubs"""
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_another_fake_dummy/test_patch.py b/samples/openapi3/client/petstore/python/test/test_paths/test_another_fake_dummy/test_patch.py
index 2149a601389..693fe5215af 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_another_fake_dummy/test_patch.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_another_fake_dummy/test_patch.py
@@ -23,10 +23,10 @@ class TestAnotherFakeDummy(ApiTestMixin, unittest.TestCase):
     AnotherFakeDummy unit test stubs
         To test special tags  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = patch.ApiForpatch(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_delete.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_delete.py
index 4eed6ab78ac..1f13c0a840a 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_delete.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_delete.py
@@ -23,10 +23,10 @@ class TestFake(ApiTestMixin, unittest.TestCase):
     Fake unit test stubs
         Fake endpoint to test group parameters (optional)  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_get.py
index 044372ef9a6..ab4f50a4620 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_get.py
@@ -23,10 +23,10 @@ class TestFake(ApiTestMixin, unittest.TestCase):
     Fake unit test stubs
         To test enum parameters  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_patch.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_patch.py
index 338a0243229..9a05bcd5d8b 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_patch.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_patch.py
@@ -23,10 +23,10 @@ class TestFake(ApiTestMixin, unittest.TestCase):
     Fake unit test stubs
         To test \"client\" model  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = patch.ApiForpatch(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_post.py
index 910c0695bf3..52175314fcd 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake/test_post.py
@@ -23,10 +23,10 @@ class TestFake(ApiTestMixin, unittest.TestCase):
     Fake unit test stubs
         Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_additional_properties_with_array_of_enums/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_additional_properties_with_array_of_enums/test_get.py
index 8c62bb8c4d7..b47d66136f9 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_additional_properties_with_array_of_enums/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_additional_properties_with_array_of_enums/test_get.py
@@ -23,10 +23,10 @@ class TestFakeAdditionalPropertiesWithArrayOfEnums(ApiTestMixin, unittest.TestCa
     FakeAdditionalPropertiesWithArrayOfEnums unit test stubs
         Additional Properties with Array of Enums  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_file_schema/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_file_schema/test_put.py
index 8e99ff7b70f..700ffe47d52 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_file_schema/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_file_schema/test_put.py
@@ -22,10 +22,10 @@ class TestFakeBodyWithFileSchema(ApiTestMixin, unittest.TestCase):
     """
     FakeBodyWithFileSchema unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_query_params/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_query_params/test_put.py
index eb1768016b3..54844694284 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_query_params/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_body_with_query_params/test_put.py
@@ -22,10 +22,10 @@ class TestFakeBodyWithQueryParams(ApiTestMixin, unittest.TestCase):
     """
     FakeBodyWithQueryParams unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_case_sensitive_params/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_case_sensitive_params/test_put.py
index 2669b681484..66b3e49f3a7 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_case_sensitive_params/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_case_sensitive_params/test_put.py
@@ -22,10 +22,10 @@ class TestFakeCaseSensitiveParams(ApiTestMixin, unittest.TestCase):
     """
     FakeCaseSensitiveParams unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_classname_test/test_patch.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_classname_test/test_patch.py
index 9a8186c598c..9ff8a1b74c2 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_classname_test/test_patch.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_classname_test/test_patch.py
@@ -23,10 +23,10 @@ class TestFakeClassnameTest(ApiTestMixin, unittest.TestCase):
     FakeClassnameTest unit test stubs
         To test class name in snake case  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = patch.ApiForpatch(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_delete_coffee_id/test_delete.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_delete_coffee_id/test_delete.py
index 5896e9b03b7..c7e25d6389d 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_delete_coffee_id/test_delete.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_delete_coffee_id/test_delete.py
@@ -23,10 +23,10 @@ class TestFakeDeleteCoffeeId(ApiTestMixin, unittest.TestCase):
     FakeDeleteCoffeeId unit test stubs
         Delete coffee  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_health/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_health/test_get.py
index 06f1652a96c..a0e8bbe7338 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_health/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_health/test_get.py
@@ -23,10 +23,10 @@ class TestFakeHealth(ApiTestMixin, unittest.TestCase):
     FakeHealth unit test stubs
         Health check endpoint  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_additional_properties/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_additional_properties/test_post.py
index 2e69f23e9f2..54326ca9266 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_additional_properties/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_additional_properties/test_post.py
@@ -23,10 +23,10 @@ class TestFakeInlineAdditionalProperties(ApiTestMixin, unittest.TestCase):
     FakeInlineAdditionalProperties unit test stubs
         test inline additionalProperties  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_composition/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_composition/test_post.py
index f02c040610b..125b7e31e65 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_composition/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_inline_composition/test_post.py
@@ -23,10 +23,10 @@ class TestFakeInlineComposition(ApiTestMixin, unittest.TestCase):
     FakeInlineComposition unit test stubs
         testing composed schemas at inline locations  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_form_data/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_form_data/test_get.py
index 4c63e28a1aa..8ad86b50ecc 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_form_data/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_form_data/test_get.py
@@ -23,10 +23,10 @@ class TestFakeJsonFormData(ApiTestMixin, unittest.TestCase):
     FakeJsonFormData unit test stubs
         test json serialization of form data  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_patch/test_patch.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_patch/test_patch.py
index c3d35ee5a47..c92ba55fbd4 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_patch/test_patch.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_patch/test_patch.py
@@ -23,10 +23,10 @@ class TestFakeJsonPatch(ApiTestMixin, unittest.TestCase):
     FakeJsonPatch unit test stubs
         json patch  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = patch.ApiForpatch(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_with_charset/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_with_charset/test_post.py
index b658c1ed84d..9f29d277aee 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_with_charset/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_json_with_charset/test_post.py
@@ -23,10 +23,10 @@ class TestFakeJsonWithCharset(ApiTestMixin, unittest.TestCase):
     FakeJsonWithCharset unit test stubs
         json with charset tx and rx  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_obj_in_query/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_obj_in_query/test_get.py
index 972fec835e1..b99a97748e4 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_obj_in_query/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_obj_in_query/test_get.py
@@ -23,10 +23,10 @@ class TestFakeObjInQuery(ApiTestMixin, unittest.TestCase):
     FakeObjInQuery unit test stubs
         user list  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_parameter_collisions1_abab_self_ab/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_parameter_collisions1_abab_self_ab/test_post.py
index 8a9c2f03d89..6db9ac4836f 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_parameter_collisions1_abab_self_ab/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_parameter_collisions1_abab_self_ab/test_post.py
@@ -23,10 +23,10 @@ class TestFakeParameterCollisions1ABAbSelfAB(ApiTestMixin, unittest.TestCase):
     FakeParameterCollisions1ABAbSelfAB unit test stubs
         parameter collision case  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_pet_id_upload_image_with_required_file/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_pet_id_upload_image_with_required_file/test_post.py
index 5795de92ef7..a707a82bd84 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_pet_id_upload_image_with_required_file/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_pet_id_upload_image_with_required_file/test_post.py
@@ -23,10 +23,10 @@ class TestFakePetIdUploadImageWithRequiredFile(ApiTestMixin, unittest.TestCase):
     FakePetIdUploadImageWithRequiredFile unit test stubs
         uploads an image (required)  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_query_param_with_json_content_type/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_query_param_with_json_content_type/test_get.py
index 84755598180..7723b43fb6b 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_query_param_with_json_content_type/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_query_param_with_json_content_type/test_get.py
@@ -23,10 +23,10 @@ class TestFakeQueryParamWithJsonContentType(ApiTestMixin, unittest.TestCase):
     FakeQueryParamWithJsonContentType unit test stubs
         query param with json content-type  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_ref_obj_in_query/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_ref_obj_in_query/test_get.py
index 527c281cc56..22bd48e509b 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_ref_obj_in_query/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_ref_obj_in_query/test_get.py
@@ -23,10 +23,10 @@ class TestFakeRefObjInQuery(ApiTestMixin, unittest.TestCase):
     FakeRefObjInQuery unit test stubs
         user list  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_array_of_enums/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_array_of_enums/test_post.py
index 84de737c521..264c4d27141 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_array_of_enums/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_array_of_enums/test_post.py
@@ -23,10 +23,10 @@ class TestFakeRefsArrayOfEnums(ApiTestMixin, unittest.TestCase):
     FakeRefsArrayOfEnums unit test stubs
         Array of Enums  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_arraymodel/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_arraymodel/test_post.py
index 2158fa0c003..86482c61277 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_arraymodel/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_arraymodel/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsArraymodel(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsArraymodel unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_boolean/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_boolean/test_post.py
index 4d5a60ade1f..96403af923e 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_boolean/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_boolean/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsBoolean(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsBoolean unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_composed_one_of_number_with_validations/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_composed_one_of_number_with_validations/test_post.py
index d758297024b..99f27d72341 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_composed_one_of_number_with_validations/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_composed_one_of_number_with_validations/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsComposedOneOfNumberWithValidations(ApiTestMixin, unittest.Test
     """
     FakeRefsComposedOneOfNumberWithValidations unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_enum/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_enum/test_post.py
index 2b3d6d86df7..15522562789 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_enum/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_enum/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsEnum(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsEnum unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_mammal/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_mammal/test_post.py
index 992cf7e9af5..fcdaa43e662 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_mammal/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_mammal/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsMammal(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsMammal unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_number/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_number/test_post.py
index f2c8a3afb5f..e8b5db3436c 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_number/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_number/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsNumber(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsNumber unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_object_model_with_ref_props/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_object_model_with_ref_props/test_post.py
index 7b3cfebff99..bbd490f5afb 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_object_model_with_ref_props/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_object_model_with_ref_props/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsObjectModelWithRefProps(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsObjectModelWithRefProps unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_string/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_string/test_post.py
index b2682a8be08..c8e130a7ee8 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_string/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_refs_string/test_post.py
@@ -22,10 +22,10 @@ class TestFakeRefsString(ApiTestMixin, unittest.TestCase):
     """
     FakeRefsString unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_response_without_schema/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_response_without_schema/test_get.py
index 4cc2002e2f2..34a8a3bad07 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_response_without_schema/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_response_without_schema/test_get.py
@@ -23,10 +23,10 @@ class TestFakeResponseWithoutSchema(ApiTestMixin, unittest.TestCase):
     FakeResponseWithoutSchema unit test stubs
         receives a response without schema  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py
index 683f36306c9..07f89240340 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_test_query_paramters/test_put.py
@@ -22,10 +22,10 @@ class TestFakeTestQueryParamters(ApiTestMixin, unittest.TestCase):
     """
     FakeTestQueryParamters unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_download_file/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_download_file/test_post.py
index f3dce6e431f..938ccb64bf5 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_download_file/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_download_file/test_post.py
@@ -23,10 +23,10 @@ class TestFakeUploadDownloadFile(ApiTestMixin, unittest.TestCase):
     FakeUploadDownloadFile unit test stubs
         uploads a file and downloads a file using application/octet-stream  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_file/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_file/test_post.py
index 0846e7f1495..91194b0aecd 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_file/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_file/test_post.py
@@ -23,10 +23,10 @@ class TestFakeUploadFile(ApiTestMixin, unittest.TestCase):
     FakeUploadFile unit test stubs
         uploads a file using multipart/form-data  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_files/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_files/test_post.py
index e00c81354fc..122d23b7499 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_files/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_fake_upload_files/test_post.py
@@ -23,10 +23,10 @@ class TestFakeUploadFiles(ApiTestMixin, unittest.TestCase):
     FakeUploadFiles unit test stubs
         uploads files using multipart/form-data  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_foo/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_foo/test_get.py
index 5e049eb9a2b..75596507276 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_foo/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_foo/test_get.py
@@ -22,10 +22,10 @@ class TestFoo(ApiTestMixin, unittest.TestCase):
     """
     Foo unit test stubs
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_post.py
index c21409c3740..9e4318e9ad2 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_post.py
@@ -23,10 +23,10 @@ class TestPet(ApiTestMixin, unittest.TestCase):
     Pet unit test stubs
         Add a new pet to the store  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_put.py
index 4e5a1548de4..8dc86d80604 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet/test_put.py
@@ -23,10 +23,10 @@ class TestPet(ApiTestMixin, unittest.TestCase):
     Pet unit test stubs
         Update an existing pet  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_status/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_status/test_get.py
index 0753075c46f..99b5c1f0063 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_status/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_status/test_get.py
@@ -23,10 +23,10 @@ class TestPetFindByStatus(ApiTestMixin, unittest.TestCase):
     PetFindByStatus unit test stubs
         Finds Pets by status  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_tags/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_tags/test_get.py
index ee1a1989461..c90b7d8be42 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_tags/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_find_by_tags/test_get.py
@@ -23,10 +23,10 @@ class TestPetFindByTags(ApiTestMixin, unittest.TestCase):
     PetFindByTags unit test stubs
         Finds Pets by tags  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_delete.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_delete.py
index c37b5cec672..4db73e05daa 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_delete.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_delete.py
@@ -23,10 +23,10 @@ class TestPetPetId(ApiTestMixin, unittest.TestCase):
     PetPetId unit test stubs
         Deletes a pet  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_get.py
index 4f0ec3c5873..3894e484cee 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_get.py
@@ -23,10 +23,10 @@ class TestPetPetId(ApiTestMixin, unittest.TestCase):
     PetPetId unit test stubs
         Find pet by ID  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_post.py
index cc0829912f6..9ffb92126cd 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id/test_post.py
@@ -23,10 +23,10 @@ class TestPetPetId(ApiTestMixin, unittest.TestCase):
     PetPetId unit test stubs
         Updates a pet in the store with form data  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id_upload_image/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id_upload_image/test_post.py
index 95c90480755..5c2a3156f8f 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id_upload_image/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_pet_pet_id_upload_image/test_post.py
@@ -23,10 +23,10 @@ class TestPetPetIdUploadImage(ApiTestMixin, unittest.TestCase):
     PetPetIdUploadImage unit test stubs
         uploads an image  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_store_inventory/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_store_inventory/test_get.py
index 4ecac607c7e..8fea847197f 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_store_inventory/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_store_inventory/test_get.py
@@ -23,10 +23,10 @@ class TestStoreInventory(ApiTestMixin, unittest.TestCase):
     StoreInventory unit test stubs
         Returns pet inventories by status  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order/test_post.py
index f3cd9abaa8d..44b90fa7a2a 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order/test_post.py
@@ -23,10 +23,10 @@ class TestStoreOrder(ApiTestMixin, unittest.TestCase):
     StoreOrder unit test stubs
         Place an order for a pet  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_delete.py b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_delete.py
index c9a1a2fd5dd..5767c6c32fc 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_delete.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_delete.py
@@ -23,10 +23,10 @@ class TestStoreOrderOrderId(ApiTestMixin, unittest.TestCase):
     StoreOrderOrderId unit test stubs
         Delete purchase order by ID  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_get.py
index 547460d2fe3..f98a2eecf6c 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_store_order_order_id/test_get.py
@@ -23,10 +23,10 @@ class TestStoreOrderOrderId(ApiTestMixin, unittest.TestCase):
     StoreOrderOrderId unit test stubs
         Find purchase order by ID  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user/test_post.py
index a6563d8d2ac..e36668daf9e 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user/test_post.py
@@ -23,10 +23,10 @@ class TestUser(ApiTestMixin, unittest.TestCase):
     User unit test stubs
         Create user  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_array/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_array/test_post.py
index 94e2acbc96b..5dbfd57cb01 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_array/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_array/test_post.py
@@ -23,10 +23,10 @@ class TestUserCreateWithArray(ApiTestMixin, unittest.TestCase):
     UserCreateWithArray unit test stubs
         Creates list of users with given input array  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_list/test_post.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_list/test_post.py
index 79428b7c0d6..44a0ce37f8e 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_list/test_post.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_create_with_list/test_post.py
@@ -23,10 +23,10 @@ class TestUserCreateWithList(ApiTestMixin, unittest.TestCase):
     UserCreateWithList unit test stubs
         Creates list of users with given input array  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = post.ApiForpost(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_login/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_login/test_get.py
index ffe000219b9..b483b712092 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_login/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_login/test_get.py
@@ -23,10 +23,10 @@ class TestUserLogin(ApiTestMixin, unittest.TestCase):
     UserLogin unit test stubs
         Logs user into the system  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_logout/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_logout/test_get.py
index e7fa1f83468..7dbf7c4e663 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_logout/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_logout/test_get.py
@@ -23,10 +23,10 @@ class TestUserLogout(ApiTestMixin, unittest.TestCase):
     UserLogout unit test stubs
         Logs out current logged in user session  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_delete.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_delete.py
index 573f7918269..b55dab5bc15 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_delete.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_delete.py
@@ -23,10 +23,10 @@ class TestUserUsername(ApiTestMixin, unittest.TestCase):
     UserUsername unit test stubs
         Delete user  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = delete.ApiFordelete(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_get.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_get.py
index d457d02cc92..bb9095e7824 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_get.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_get.py
@@ -23,10 +23,10 @@ class TestUserUsername(ApiTestMixin, unittest.TestCase):
     UserUsername unit test stubs
         Get user by user name  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = get.ApiForget(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_put.py b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_put.py
index 955a26355f4..298660a4267 100644
--- a/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_put.py
+++ b/samples/openapi3/client/petstore/python/test/test_paths/test_user_username/test_put.py
@@ -23,10 +23,10 @@ class TestUserUsername(ApiTestMixin, unittest.TestCase):
     UserUsername unit test stubs
         Updated user  # noqa: E501
     """
-    _configuration = configuration.Configuration()
+    configuration_ = configuration.Configuration()
 
     def setUp(self):
-        used_api_client = api_client.ApiClient(configuration=self._configuration)
+        used_api_client = api_client.ApiClient(configuration=self.configuration_)
         self.api = put.ApiForput(api_client=used_api_client)  # noqa: E501
 
     def tearDown(self):
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_class.py b/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_class.py
index a27941748d4..c5a223587e6 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_class.py
@@ -22,7 +22,7 @@ def test_additional_properties_class(self):
         inst = AdditionalPropertiesClass({})
         with self.assertRaises(KeyError):
             inst["map_property"]
-        assert inst.get_item_oapg("map_property") is schemas.unset
+        assert inst.get_item_("map_property") is schemas.unset
         with self.assertRaises(AttributeError):
             inst.map_property
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_validator.py b/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_validator.py
index 2c60d44485e..5042fa7defb 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_validator.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_additional_properties_validator.py
@@ -30,8 +30,8 @@ def test_additional_properties_validator(self):
         assert add_prop == 'abc'
         assert isinstance(add_prop, str)
         assert isinstance(add_prop, schemas.AnyTypeSchema)
-        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.AllOf.classes[1].MetaOapg.AdditionalProperties)
-        assert isinstance(add_prop, AdditionalPropertiesValidator.MetaOapg.AllOf.classes[2].MetaOapg.AdditionalProperties)
+        assert isinstance(add_prop, AdditionalPropertiesValidator.Schema_.AllOf.classes[1].Schema_.AdditionalProperties)
+        assert isinstance(add_prop, AdditionalPropertiesValidator.Schema_.AllOf.classes[2].Schema_.AdditionalProperties)
         assert not isinstance(add_prop, schemas.UnsetAnyTypeSchema)
 
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_animal.py b/samples/openapi3/client/petstore/python/tests_manual/test_animal.py
index 91ca18cfeb3..32896c60096 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_animal.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_animal.py
@@ -43,7 +43,7 @@ def testAnimal(self):
         animal = Animal(className='Cat', color='black')
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Cat)
-        assert isinstance(animal, Cat.MetaOapg.AllOf.classes[1])
+        assert isinstance(animal, Cat.Schema_.AllOf.classes[1])
         assert isinstance(animal, Animal)
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Cat'
@@ -56,7 +56,7 @@ def testAnimal(self):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Cat)
-        assert isinstance(animal, Cat.MetaOapg.AllOf.classes[1])
+        assert isinstance(animal, Cat.Schema_.AllOf.classes[1])
         assert set(animal.keys()) == {'className', 'color', 'declawed'}
         assert animal.className == 'Cat'
         assert animal["color"] == 'black'
@@ -70,7 +70,7 @@ def testAnimal(self):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Dog)
-        assert isinstance(animal, Dog.MetaOapg.AllOf.classes[1])
+        assert isinstance(animal, Dog.Schema_.AllOf.classes[1])
         assert set(animal.keys()) == {'className', 'color'}
         assert animal.className == 'Dog'
         assert animal["color"] == 'black'
@@ -82,7 +82,7 @@ def testAnimal(self):
         assert isinstance(animal, Animal)
         assert isinstance(animal, frozendict.frozendict)
         assert isinstance(animal, Dog)
-        assert isinstance(animal, Dog.MetaOapg.AllOf.classes[1])
+        assert isinstance(animal, Dog.Schema_.AllOf.classes[1])
         assert set(animal.keys()) == {'className', 'color', 'breed'}
         assert animal.className == 'Dog'
         assert animal["color"] == 'black'
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_any_type_schema.py b/samples/openapi3/client/petstore/python/tests_manual/test_any_type_schema.py
index ffe15920165..3a47267261e 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_any_type_schema.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_any_type_schema.py
@@ -37,7 +37,7 @@ class TestAnyTypeSchema(unittest.TestCase):
 
     def testDictSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -54,7 +54,7 @@ class AllOf:
 
     def testListSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -71,7 +71,7 @@ class AllOf:
 
     def testStrSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -88,7 +88,7 @@ class AllOf:
 
     def testNumberSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -112,7 +112,7 @@ class AllOf:
 
     def testIntSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -133,7 +133,7 @@ class AllOf:
 
     def testBoolSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -157,7 +157,7 @@ class AllOf:
 
     def testNoneSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -166,7 +166,7 @@ class AllOf:
                     ]
 
         m = Model(None)
-        self.assertTrue(m.is_none_oapg())
+        self.assertTrue(m.is_none_())
         assert isinstance(m, Model)
         assert isinstance(m, AnyTypeSchema)
         assert isinstance(m, NoneSchema)
@@ -174,7 +174,7 @@ class AllOf:
 
     def testDateSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -191,7 +191,7 @@ class AllOf:
 
     def testDateTimeSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -208,7 +208,7 @@ class AllOf:
 
     def testDecimalSchema(self):
         class Model(AnyTypeSchema):
-            class MetaOapg:
+            class Schema_:
 
                 class AllOf:
                     classes = [
@@ -218,7 +218,7 @@ class AllOf:
 
         m = Model('12.34')
         assert m == '12.34'
-        assert m.as_decimal_oapg == Decimal('12.34')
+        assert m.as_decimal_ == Decimal('12.34')
         assert isinstance(m, Model)
         assert isinstance(m, AnyTypeSchema)
         assert isinstance(m, DecimalSchema)
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_boolean_enum.py b/samples/openapi3/client/petstore/python/tests_manual/test_boolean_enum.py
index d376b4cbd5e..91de07ee449 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_boolean_enum.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_boolean_enum.py
@@ -29,8 +29,8 @@ def test_BooleanEnum(self):
         """Test BooleanEnum"""
         model = BooleanEnum(True)
         assert model is BooleanEnum.TRUE
-        assert model.is_true_oapg()
-        assert model.is_false_oapg() is False
+        assert model.is_true_()
+        assert model.is_false_() is False
         assert repr(model) == '<DynamicSchema: True>'
         with self.assertRaises(petstore_api.ApiValueError):
             BooleanEnum(False)
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_composed_bool.py b/samples/openapi3/client/petstore/python/tests_manual/test_composed_bool.py
index f6216d5254f..4a3761dca04 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_composed_bool.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_composed_bool.py
@@ -33,11 +33,11 @@ def test_ComposedBool(self):
                 model = ComposedBool(value)
                 if value is True:
                     self.assertTrue(bool(model))
-                    self.assertTrue(model.is_true_oapg())
-                    self.assertFalse(model.is_false_oapg())
+                    self.assertTrue(model.is_true_())
+                    self.assertFalse(model.is_false_())
                 else:
-                    self.assertTrue(model.is_false_oapg())
-                    self.assertFalse(model.is_true_oapg())
+                    self.assertTrue(model.is_false_())
+                    self.assertFalse(model.is_true_())
                     self.assertFalse(bool(model))
                 continue
             with self.assertRaises(petstore_api.ApiTypeError):
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_composed_one_of_different_types.py b/samples/openapi3/client/petstore/python/tests_manual/test_composed_one_of_different_types.py
index e50804a9d8b..fa7fc34f0c1 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_composed_one_of_different_types.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_composed_one_of_different_types.py
@@ -52,56 +52,56 @@ def test_ComposedOneOfDifferentTypes(self):
 
         # None
         inst = ComposedOneOfDifferentTypes(None)
-        inst.is_none_oapg()
+        inst.is_none_()
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, Singleton)
         assert isinstance(inst, NoneClass)
-        assert inst.is_none_oapg() is True
+        assert inst.is_none_() is True
 
         # date
-        inst = ComposedOneOfDifferentTypes.from_openapi_data_oapg('2019-01-10')
+        inst = ComposedOneOfDifferentTypes.from_openapi_data_('2019-01-10')
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateSchema)
         assert isinstance(inst, str)
-        assert inst.as_date_oapg.year == 2019
-        assert inst.as_date_oapg.month == 1
-        assert inst.as_date_oapg.day == 10
+        assert inst.as_date_.year == 2019
+        assert inst.as_date_.month == 1
+        assert inst.as_date_.day == 10
 
         # date
         inst = ComposedOneOfDifferentTypes(date(2019, 1, 10))
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateSchema)
         assert isinstance(inst, str)
-        assert inst.as_date_oapg.year == 2019
-        assert inst.as_date_oapg.month == 1
-        assert inst.as_date_oapg.day == 10
+        assert inst.as_date_.year == 2019
+        assert inst.as_date_.month == 1
+        assert inst.as_date_.day == 10
 
         # date-time
-        inst = ComposedOneOfDifferentTypes.from_openapi_data_oapg('2020-01-02T03:04:05Z')
+        inst = ComposedOneOfDifferentTypes.from_openapi_data_('2020-01-02T03:04:05Z')
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateTimeSchema)
         assert isinstance(inst, str)
-        assert inst.as_datetime_oapg.year == 2020
-        assert inst.as_datetime_oapg.month == 1
-        assert inst.as_datetime_oapg.day == 2
-        assert inst.as_datetime_oapg.hour == 3
-        assert inst.as_datetime_oapg.minute == 4
-        assert inst.as_datetime_oapg.second == 5
+        assert inst.as_datetime_.year == 2020
+        assert inst.as_datetime_.month == 1
+        assert inst.as_datetime_.day == 2
+        assert inst.as_datetime_.hour == 3
+        assert inst.as_datetime_.minute == 4
+        assert inst.as_datetime_.second == 5
         utc_tz = tzutc()
-        assert inst.as_datetime_oapg.tzinfo == utc_tz
+        assert inst.as_datetime_.tzinfo == utc_tz
 
         # date-time
         inst = ComposedOneOfDifferentTypes(datetime(2020, 1, 2, 3, 4, 5, tzinfo=timezone.utc))
         assert isinstance(inst, ComposedOneOfDifferentTypes)
         assert isinstance(inst, DateTimeSchema)
         assert isinstance(inst, str)
-        assert inst.as_datetime_oapg.year == 2020
-        assert inst.as_datetime_oapg.month == 1
-        assert inst.as_datetime_oapg.day == 2
-        assert inst.as_datetime_oapg.hour == 3
-        assert inst.as_datetime_oapg.minute == 4
-        assert inst.as_datetime_oapg.second == 5
-        assert inst.as_datetime_oapg.tzinfo == utc_tz
+        assert inst.as_datetime_.year == 2020
+        assert inst.as_datetime_.month == 1
+        assert inst.as_datetime_.day == 2
+        assert inst.as_datetime_.hour == 3
+        assert inst.as_datetime_.minute == 4
+        assert inst.as_datetime_.second == 5
+        assert inst.as_datetime_.tzinfo == utc_tz
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_date_time_with_validations.py b/samples/openapi3/client/petstore/python/tests_manual/test_date_time_with_validations.py
index 3d15803539e..aca44eefead 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_date_time_with_validations.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_date_time_with_validations.py
@@ -36,30 +36,30 @@ def testDateTimeWithValidations(self):
             inst = DateTimeWithValidations(valid_value)
             assert inst == expected_datetime
 
-        # when passing data in with from_openapi_data_oapg one must use str
+        # when passing data in with from_openapi_data_ one must use str
         with self.assertRaisesRegex(
             petstore_api.ApiTypeError,
             r"Invalid type. Required value type is str and passed "
             r"type was <class 'datetime.datetime'> at \('args\[0\]',\)"
         ):
-            DateTimeWithValidations.from_openapi_data_oapg(datetime(2020, 1, 1))
+            DateTimeWithValidations.from_openapi_data_(datetime(2020, 1, 1))
 
-        # when passing data from_openapi_data_oapg we can use str
+        # when passing data from_openapi_data_ we can use str
         input_value_to_datetime = {
             "2020-01-01T00:00:00": datetime(2020, 1, 1, tzinfo=None),
             "2020-01-01T00:00:00Z": datetime(2020, 1, 1, tzinfo=timezone.utc),
             "2020-01-01T00:00:00+00:00": datetime(2020, 1, 1, tzinfo=timezone.utc)
         }
         for input_value, expected_datetime in input_value_to_datetime.items():
-            inst = DateTimeWithValidations.from_openapi_data_oapg(input_value)
-            assert inst.as_datetime_oapg == expected_datetime
+            inst = DateTimeWithValidations.from_openapi_data_(input_value)
+            assert inst.as_datetime_ == expected_datetime
 
         # value error is raised if an invalid string is passed in
         with self.assertRaisesRegex(
             petstore_api.ApiValueError,
             r"Value does not conform to the required ISO-8601 datetime format. Invalid value 'abcd' for type datetime at \('args\[0\]',\)"
         ):
-            DateTimeWithValidations.from_openapi_data_oapg("abcd")
+            DateTimeWithValidations.from_openapi_data_("abcd")
 
         # value error is raised if a date is passed in
         with self.assertRaisesRegex(
@@ -74,7 +74,7 @@ def testDateTimeWithValidations(self):
             petstore_api.ApiValueError,
             error_regex
         ):
-            DateTimeWithValidations.from_openapi_data_oapg("2019-01-01T00:00:00Z")
+            DateTimeWithValidations.from_openapi_data_("2019-01-01T00:00:00Z")
         # pattern checking with date input
         error_regex = r"Invalid value `2019-01-01T00:00:00`, must match regular expression `.+?` at \('args\[0\]',\)"
         with self.assertRaisesRegex(
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_date_with_validations.py b/samples/openapi3/client/petstore/python/tests_manual/test_date_with_validations.py
index eb6161113f9..561b6f93f47 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_date_with_validations.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_date_with_validations.py
@@ -36,28 +36,28 @@ def testDateWithValidations(self):
             inst = DateWithValidations(valid_value)
             assert inst == expected_date
 
-        # when passing data in with from_openapi_data_oapg one must use str
+        # when passing data in with from_openapi_data_ one must use str
         with self.assertRaisesRegex(
             petstore_api.ApiTypeError,
             r"Invalid type. Required value type is str and passed "
             r"type was <class 'datetime.date'> at \('args\[0\]',\)"
 
         ):
-            DateWithValidations.from_openapi_data_oapg(date(2020, 1, 1))
+            DateWithValidations.from_openapi_data_(date(2020, 1, 1))
 
         # when passing data in from the server we can use str
         valid_values = ["2020-01-01", "2020-01", "2020"]
         expected_date = date(2020, 1, 1)
         for valid_value in valid_values:
-            inst = DateWithValidations.from_openapi_data_oapg(valid_value)
-            assert inst.as_date_oapg == expected_date
+            inst = DateWithValidations.from_openapi_data_(valid_value)
+            assert inst.as_date_ == expected_date
 
         # value error is raised if an invalid string is passed in
         with self.assertRaisesRegex(
             petstore_api.ApiValueError,
             r"Value does not conform to the required ISO-8601 date format. Invalid value '2020-01-01T00:00:00Z' for type date at \('args\[0\]',\)"
         ):
-            DateWithValidations.from_openapi_data_oapg("2020-01-01T00:00:00Z")
+            DateWithValidations.from_openapi_data_("2020-01-01T00:00:00Z")
 
         # value error is raised if a datetime is passed in
         with self.assertRaisesRegex(
@@ -71,7 +71,7 @@ def testDateWithValidations(self):
                 petstore_api.ApiValueError,
                 r"Value does not conform to the required ISO-8601 date format. Invalid value 'abcd' for type date at \('args\[0\]',\)"
         ):
-            DateWithValidations.from_openapi_data_oapg("abcd")
+            DateWithValidations.from_openapi_data_("abcd")
 
         # pattern checking for str input
         error_regex = r"Invalid value `2019-01-01`, must match regular expression `.+?` at \('args\[0\]',\)"
@@ -79,7 +79,7 @@ def testDateWithValidations(self):
             petstore_api.ApiValueError,
             error_regex
         ):
-            DateWithValidations.from_openapi_data_oapg("2019-01-01")
+            DateWithValidations.from_openapi_data_("2019-01-01")
         # pattern checking for date input
         with self.assertRaisesRegex(
             petstore_api.ApiValueError,
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_decimal_payload.py b/samples/openapi3/client/petstore/python/tests_manual/test_decimal_payload.py
index efd2264f830..6baafcc0bee 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_decimal_payload.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_decimal_payload.py
@@ -28,14 +28,14 @@ def test_DecimalPayload(self):
         assert isinstance(m, DecimalSchema)
         assert isinstance(m, str)
         assert m == '12'
-        assert m.as_decimal_oapg == decimal.Decimal('12')
+        assert m.as_decimal_ == decimal.Decimal('12')
 
         m = DecimalPayload('12.34')
         assert isinstance(m, DecimalPayload)
         assert isinstance(m, DecimalSchema)
         assert isinstance(m, str)
         assert m == '12.34'
-        assert m.as_decimal_oapg == decimal.Decimal('12.34')
+        assert m.as_decimal_ == decimal.Decimal('12.34')
 
         # passing in a Decimal does not work
         with self.assertRaises(petstore_api.ApiTypeError):
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py
index 398bd658d3e..55e367eb448 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py
@@ -738,7 +738,7 @@ def test_json_with_charset(self):
 
             assert isinstance(api_response.body, schemas.AnyTypeSchema)
             assert isinstance(api_response.body, schemas.NoneClass)
-            assert api_response.body.is_none_oapg()
+            assert api_response.body.is_none_()
 
     def test_response_without_schema(self):
         # received response is not loaded into body because there is no deserialization schema defined
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_format_test.py b/samples/openapi3/client/petstore/python/tests_manual/test_format_test.py
index 9de52249e40..e94ec9bf506 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_format_test.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_format_test.py
@@ -103,7 +103,7 @@ def test_FormatTest(self):
         model = FormatTest(noneProp=None, **required_args)
         assert isinstance(model["noneProp"], Singleton)
         self.assertFalse(model["noneProp"])
-        self.assertTrue(model["noneProp"].is_none_oapg())
+        self.assertTrue(model["noneProp"].is_none_())
 
         # binary check
         model = FormatTest(binary=b'123', **required_args)
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_fruit.py b/samples/openapi3/client/petstore/python/tests_manual/test_fruit.py
index 21341535c1c..aa1108efdf1 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_fruit.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_fruit.py
@@ -51,7 +51,7 @@ def testFruit(self):
         # with a key
         with self.assertRaises(KeyError):
             assert fruit['cultivar']
-        assert fruit.get_item_oapg('cultivar') is schemas.unset
+        assert fruit.get_item_('cultivar') is schemas.unset
 
         """
         including extra parameters does not raise an exception
@@ -64,7 +64,7 @@ def testFruit(self):
             additional_date='2021-01-02',
         )
 
-        fruit = Fruit.from_openapi_data_oapg(kwargs)
+        fruit = Fruit.from_openapi_data_(kwargs)
         self.assertEqual(
             fruit,
             kwargs
@@ -105,7 +105,7 @@ def testFruitNullValue(self):
         fruit = apple.Apple(None)
         assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, apple.Apple)
-        assert fruit.is_none_oapg() is True
+        assert fruit.is_none_() is True
 
         # 'banana' is not nullable.
         # TODO cast this into ApiTypeError?
@@ -118,7 +118,7 @@ def testFruitNullValue(self):
         assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, apple.Apple)
         assert isinstance(fruit, Fruit)
-        assert fruit.is_none_oapg() is True
+        assert fruit.is_none_() is True
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_fruit_req.py b/samples/openapi3/client/petstore/python/tests_manual/test_fruit_req.py
index 3dbbe9070e5..fe3f060e726 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_fruit_req.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_fruit_req.py
@@ -60,7 +60,7 @@ def testFruitReq(self):
             fruit['cultivar']
         with self.assertRaises(AttributeError):
             fruit.cultivar
-        assert fruit.get_item_oapg('cultivar') is schemas.unset
+        assert fruit.get_item_('cultivar') is schemas.unset
 
         # with getattr
         self.assertEqual(getattr(fruit, 'cultivar', 'some value'), 'some value')
@@ -103,7 +103,7 @@ def testFruitReq(self):
         assert isinstance(fruit, schemas.Singleton)
         assert isinstance(fruit, FruitReq)
         assert isinstance(fruit, schemas.NoneSchema)
-        assert fruit.is_none_oapg() is True
+        assert fruit.is_none_() is True
 
 
 if __name__ == '__main__':
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_gm_fruit.py b/samples/openapi3/client/petstore/python/tests_manual/test_gm_fruit.py
index 68cb1834d2f..1f350521c7f 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_gm_fruit.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_gm_fruit.py
@@ -60,11 +60,11 @@ def testGmFruit(self):
             fruit["origin"]
         with self.assertRaises(AttributeError):
             fruit.origin
-        assert fruit.get_item_oapg("origin") is schemas.unset
+        assert fruit.get_item_("origin") is schemas.unset
 
         with self.assertRaises(KeyError):
             fruit['unknown_variable']
-        assert fruit.get_item_oapg("unknown_variable") is schemas.unset
+        assert fruit.get_item_("unknown_variable") is schemas.unset
         # with getattr
         self.assertTrue(getattr(fruit, 'origin', 'some value'), 'some value')
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_json_encoder.py b/samples/openapi3/client/petstore/python/tests_manual/test_json_encoder.py
index d6cbdfa3757..7a2960e9eb6 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_json_encoder.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_json_encoder.py
@@ -28,7 +28,7 @@ def test_receive_encode_str_types(self):
             schemas.DateTimeSchema: '2020-01-01T00:00:00'
         }
         for schema, value in schema_to_value.items():
-            inst = schema.from_openapi_data_oapg(value)
+            inst = schema.from_openapi_data_(value)
             assert value == self.serializer.default(inst)
 
     def test_receive_encode_numeric_types(self):
@@ -41,7 +41,7 @@ def test_receive_encode_numeric_types(self):
             7.14: schemas.NumberSchema,
         }
         for value, schema in value_to_schema.items():
-            inst = schema.from_openapi_data_oapg(value)
+            inst = schema.from_openapi_data_(value)
             pre_serialize_value = self.serializer.default(inst)
             assert value == pre_serialize_value and type(value) == type(pre_serialize_value)
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_mammal.py b/samples/openapi3/client/petstore/python/tests_manual/test_mammal.py
index f13a29ec2b5..71385a2bd0b 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_mammal.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_mammal.py
@@ -43,7 +43,7 @@ def testMammal(self):
         assert isinstance(m, whale.Whale)
 
         # can use the enum value
-        m = Mammal(className=whale.Whale.MetaOapg.Properties.ClassName.WHALE)
+        m = Mammal(className=whale.Whale.Schema_.Properties.ClassName.WHALE)
         assert isinstance(m, whale.Whale)
 
         from petstore_api.components.schema import zebra
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_money.py b/samples/openapi3/client/petstore/python/tests_manual/test_money.py
index 1abf642478e..dcc8c847de7 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_money.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_money.py
@@ -23,7 +23,7 @@ def test_Money(self):
             currency='usd',
             amount='10.99'
         )
-        self.assertEqual(price.amount.as_decimal_oapg, decimal.Decimal('10.99'))
+        self.assertEqual(price.amount.as_decimal_, decimal.Decimal('10.99'))
         self.assertEqual(
             price,
             dict(currency='usd', amount='10.99')
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_no_additional_properties.py b/samples/openapi3/client/petstore/python/tests_manual/test_no_additional_properties.py
index 66110938ebc..ad83a8e6dbe 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_no_additional_properties.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_no_additional_properties.py
@@ -39,7 +39,7 @@ def testNoAdditionalProperties(self):
             inst.petId
         with self.assertRaises(KeyError):
             inst["petId"]
-        assert inst.get_item_oapg("petId") is schemas.unset
+        assert inst.get_item_("petId") is schemas.unset
 
         # works with required + optional
         inst = NoAdditionalProperties(id=1, petId=2)
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_nullable_string.py b/samples/openapi3/client/petstore/python/tests_manual/test_nullable_string.py
index abea23f385a..c43156e960c 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_nullable_string.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_nullable_string.py
@@ -32,11 +32,11 @@ def testNullableString(self):
         assert isinstance(inst, Singleton)
         assert isinstance(inst, NullableString)
         assert isinstance(inst, Schema)
-        assert inst.is_none_oapg() is True
+        assert inst.is_none_() is True
         assert repr(inst) == '<DynamicSchema: None>'
 
         inst = NullableString('approved')
-        assert inst.is_none_oapg() is False
+        assert inst.is_none_() is False
         assert isinstance(inst, NullableString)
         assert isinstance(inst, Schema)
         assert isinstance(inst, str)
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_arg_and_args_properties.py b/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_arg_and_args_properties.py
index 9330e90f9b5..95fc148bad0 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_arg_and_args_properties.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_arg_and_args_properties.py
@@ -24,13 +24,13 @@ def test_ObjectModelWithArgAndArgsProperties(self):
         self.assertTrue(
             isinstance(
                 model["arg"],
-                ObjectModelWithArgAndArgsProperties.MetaOapg.Properties.Arg
+                ObjectModelWithArgAndArgsProperties.Schema_.Properties.Arg
             )
         )
         self.assertTrue(
             isinstance(
                 model["args"],
-                ObjectModelWithArgAndArgsProperties.MetaOapg.Properties.Args
+                ObjectModelWithArgAndArgsProperties.Schema_.Properties.Args
             )
         )
         self.assertTrue(isinstance(model["arg"], schemas.StrSchema))
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_ref_props.py b/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_ref_props.py
index c9d06277776..814fe150966 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_ref_props.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_object_model_with_ref_props.py
@@ -36,9 +36,9 @@ def testObjectModelWithRefProps(self):
         assert inst["myNumber"] == 15.0
         assert isinstance(inst["myNumber"], NumberWithValidations)
         assert inst["myString"] == 'a'
-        assert isinstance(inst["myString"], ObjectModelWithRefProps.MetaOapg.Properties.my_string())
+        assert isinstance(inst["myString"], ObjectModelWithRefProps.Schema_.Properties.my_string())
         assert bool(inst["myBoolean"]) is True
-        assert isinstance(inst["myBoolean"], ObjectModelWithRefProps.MetaOapg.Properties.my_boolean())
+        assert isinstance(inst["myBoolean"], ObjectModelWithRefProps.Schema_.Properties.my_boolean())
         assert isinstance(inst["myBoolean"], BoolClass)
 
 
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_inline_composition_property.py b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_inline_composition_property.py
index d2532e2b27d..f040ef3c544 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_inline_composition_property.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_inline_composition_property.py
@@ -24,7 +24,7 @@ def test_ObjectWithInlineCompositionProperty(self):
         self.assertTrue(
             isinstance(
                 model["someProp"],
-                ObjectWithInlineCompositionProperty.MetaOapg.Properties.SomeProp
+                ObjectWithInlineCompositionProperty.Schema_.Properties.SomeProp
             )
         )
         self.assertTrue(isinstance(model["someProp"], schemas.StrSchema))
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_invalid_named_refed_properties.py b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_invalid_named_refed_properties.py
index d045fab440d..0fcf4bb076f 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_object_with_invalid_named_refed_properties.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_object_with_invalid_named_refed_properties.py
@@ -38,8 +38,8 @@ def test_instantiation_success(self):
             '!reference': (4, 5)
         }
         assert inst == primitive_data
-        # from_openapi_data_oapg works
-        inst = ObjectWithInvalidNamedRefedProperties.from_openapi_data_oapg(primitive_data)
+        # from_openapi_data_ works
+        inst = ObjectWithInvalidNamedRefedProperties.from_openapi_data_(primitive_data)
         assert inst == primitive_data
 
     def test_omitting_required_properties_fails(self):
@@ -60,13 +60,13 @@ def test_omitting_required_properties_fails(self):
                 }
             )
         with self.assertRaises(petstore_api.exceptions.ApiTypeError):
-            ObjectWithInvalidNamedRefedProperties.from_openapi_data_oapg(
+            ObjectWithInvalidNamedRefedProperties.from_openapi_data_(
                 {
                     'from': {'data': 'abc', 'id': 1},
                 }
             )
         with self.assertRaises(petstore_api.exceptions.ApiTypeError):
-            ObjectWithInvalidNamedRefedProperties.from_openapi_data_oapg(
+            ObjectWithInvalidNamedRefedProperties.from_openapi_data_(
                 {
                     '!reference': [4, 5]
                 }
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_uuid_string.py b/samples/openapi3/client/petstore/python/tests_manual/test_uuid_string.py
index fb944f197a1..e2736461d97 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_uuid_string.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_uuid_string.py
@@ -28,7 +28,7 @@ def test_UUIDString(self):
         self.assertTrue(isinstance(u, schemas.UUIDSchema))
         self.assertTrue(isinstance(u, schemas.StrSchema))
         self.assertTrue(isinstance(u, str))
-        self.assertEqual(u.as_uuid_oapg, uuid.UUID(uuid_value))
+        self.assertEqual(u.as_uuid_, uuid.UUID(uuid_value))
 
         # passing in a uuid also works
         u = UUIDString(uuid.UUID(uuid_value))
@@ -37,7 +37,7 @@ def test_UUIDString(self):
         self.assertTrue(isinstance(u, schemas.UUIDSchema))
         self.assertTrue(isinstance(u, schemas.StrSchema))
         self.assertTrue(isinstance(u, str))
-        self.assertEqual(u.as_uuid_oapg, uuid.UUID(uuid_value))
+        self.assertEqual(u.as_uuid_, uuid.UUID(uuid_value))
 
         # an invalid value does not work
         with self.assertRaises(exceptions.ApiValueError):
diff --git a/samples/openapi3/client/petstore/python/tests_manual/test_validate.py b/samples/openapi3/client/petstore/python/tests_manual/test_validate.py
index 19bd954f0b8..839a292495f 100644
--- a/samples/openapi3/client/petstore/python/tests_manual/test_validate.py
+++ b/samples/openapi3/client/petstore/python/tests_manual/test_validate.py
@@ -39,36 +39,36 @@
 class TestValidateResults(unittest.TestCase):
     def test_str_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = StringWithValidation._validate_oapg(
+        path_to_schemas = StringWithValidation._validate(
             "abcdefg", validation_metadata=vm
         )
         assert path_to_schemas == {("args[0]",): {StringWithValidation, str}}
 
     def test_number_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = NumberWithValidations._validate_oapg(
+        path_to_schemas = NumberWithValidations._validate(
             Decimal(11), validation_metadata=vm
         )
         assert path_to_schemas == {("args[0]",): {NumberWithValidations, Decimal}}
 
     def test_str_enum_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = StringEnum._validate_oapg("placed", validation_metadata=vm)
+        path_to_schemas = StringEnum._validate("placed", validation_metadata=vm)
         assert path_to_schemas == {("args[0]",): {str, StringEnum}}
 
     def test_nullable_enum_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = StringEnum._validate_oapg(NoneClass.NONE, validation_metadata=vm)
+        path_to_schemas = StringEnum._validate(NoneClass.NONE, validation_metadata=vm)
         assert path_to_schemas == {("args[0]",): {NoneClass, StringEnum}}
 
     def test_empty_list_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = ArrayHoldingAnyType._validate_oapg((), validation_metadata=vm)
+        path_to_schemas = ArrayHoldingAnyType._validate((), validation_metadata=vm)
         assert path_to_schemas == {("args[0]",): {ArrayHoldingAnyType, tuple}}
 
     def test_list_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = ArrayHoldingAnyType._validate_oapg(
+        path_to_schemas = ArrayHoldingAnyType._validate(
             (Decimal(1), "a"), validation_metadata=vm
         )
         assert path_to_schemas == {
@@ -79,12 +79,12 @@ def test_list_validate(self):
 
     def test_empty_dict_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = Foo._validate_oapg(frozendict.frozendict({}), validation_metadata=vm)
+        path_to_schemas = Foo._validate(frozendict.frozendict({}), validation_metadata=vm)
         assert path_to_schemas == {("args[0]",): {Foo, frozendict.frozendict}}
 
     def test_dict_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = Foo._validate_oapg(
+        path_to_schemas = Foo._validate(
             frozendict.frozendict({"bar": "a", "additional": Decimal(0)}),
             validation_metadata=vm,
         )
@@ -95,45 +95,45 @@ def test_dict_validate(self):
 
     def test_discriminated_dict_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = Animal._validate_oapg(
+        path_to_schemas = Animal._validate(
             frozendict.frozendict(className="Dog", color="black"), validation_metadata=vm
         )
         for schema_classes in path_to_schemas.values():
-            Animal._process_schema_classes_oapg(schema_classes)
+            Animal._process_schema_classes(schema_classes)
         assert path_to_schemas == {
-            ("args[0]",): {Animal, Dog, Dog.MetaOapg.AllOf.classes[1], frozendict.frozendict},
+            ("args[0]",): {Animal, Dog, Dog.Schema_.AllOf.classes[1], frozendict.frozendict},
             ("args[0]", "className"): {StrSchema, str},
             ("args[0]", "color"): {StrSchema, str},
         }
 
     def test_bool_enum_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = BooleanEnum._validate_oapg(BoolClass.TRUE, validation_metadata=vm)
+        path_to_schemas = BooleanEnum._validate(BoolClass.TRUE, validation_metadata=vm)
         assert path_to_schemas == {("args[0]",): {BoolClass, BooleanEnum}}
 
     def test_oneof_composition_pig_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = Pig._validate_oapg(
+        path_to_schemas = Pig._validate(
             frozendict.frozendict(className="DanishPig"), validation_metadata=vm
         )
         for schema_classes in path_to_schemas.values():
-            Pig._process_schema_classes_oapg(schema_classes)
+            Pig._process_schema_classes(schema_classes)
         assert path_to_schemas == {
             ("args[0]",): {Pig, DanishPig, frozendict.frozendict},
-            ("args[0]", "className"): {DanishPig.MetaOapg.Properties.ClassName, str},
+            ("args[0]", "className"): {DanishPig.Schema_.Properties.ClassName, str},
         }
 
     def test_anyof_composition_gm_fruit_validate(self):
         vm = ValidationMetadata(path_to_item=("args[0]",), configuration=configuration.Configuration())
-        path_to_schemas = GmFruit._validate_oapg(
+        path_to_schemas = GmFruit._validate(
             frozendict.frozendict(cultivar="GoldenDelicious", lengthCm=Decimal(10)),
             validation_metadata=vm,
         )
         for schema_classes in path_to_schemas.values():
-            GmFruit._process_schema_classes_oapg(schema_classes)
+            GmFruit._process_schema_classes(schema_classes)
         assert path_to_schemas == {
             ("args[0]",): {GmFruit, Apple, Banana, frozendict.frozendict},
-            ("args[0]", "cultivar"): {Apple.MetaOapg.Properties.Cultivar, str},
+            ("args[0]", "cultivar"): {Apple.Schema_.Properties.Cultivar, str},
             ("args[0]", "lengthCm"): {NumberSchema, Decimal},
         }
 
@@ -142,44 +142,44 @@ class TestValidateCalls(unittest.TestCase):
     def test_empty_list_validate(self):
         return_value = {("args[0]",): {ArrayHoldingAnyType, tuple}}
         with patch.object(
-            Schema, "_validate_oapg", return_value=return_value
+            Schema, "_validate", return_value=return_value
         ) as mock_validate:
             ArrayHoldingAnyType([])
             assert mock_validate.call_count == 1
 
         with patch.object(
-            Schema, "_validate_oapg", return_value=return_value
+            Schema, "_validate", return_value=return_value
         ) as mock_validate:
-            ArrayHoldingAnyType.from_openapi_data_oapg([])
+            ArrayHoldingAnyType.from_openapi_data_([])
             assert mock_validate.call_count == 1
 
     def test_empty_dict_validate(self):
         return_value = {("args[0]",): {Foo, frozendict.frozendict}}
         with patch.object(
-            Schema, "_validate_oapg", return_value=return_value
+            Schema, "_validate", return_value=return_value
         ) as mock_validate:
             Foo({})
             assert mock_validate.call_count == 1
 
         with patch.object(
-            Schema, "_validate_oapg", return_value=return_value
+            Schema, "_validate", return_value=return_value
         ) as mock_validate:
-            Foo.from_openapi_data_oapg({})
+            Foo.from_openapi_data_({})
             assert mock_validate.call_count == 1
 
     def test_list_validate_direct_instantiation(self):
         with patch.object(
             ArrayWithValidationsInItems,
-            "_validate_oapg",
-            side_effect=ArrayWithValidationsInItems._validate_oapg,
+            "_validate",
+            side_effect=ArrayWithValidationsInItems._validate,
         ) as mock_outer_validate:
             with patch.object(
-                ArrayWithValidationsInItems.MetaOapg.Items,
-                "_validate_oapg",
-                side_effect=ArrayWithValidationsInItems.MetaOapg.Items._validate_oapg,
+                ArrayWithValidationsInItems.Schema_.Items,
+                "_validate",
+                side_effect=ArrayWithValidationsInItems.Schema_.Items._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                ArrayWithValidationsInItems([7], _configuration=used_configuration)
+                ArrayWithValidationsInItems([7], configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     (Decimal("7"),),
                     validation_metadata=ValidationMetadata(path_to_item=("args[0]",), configuration=used_configuration)
@@ -191,25 +191,25 @@ def test_list_validate_direct_instantiation(self):
 
     def test_list_validate_direct_instantiation_cast_item(self):
         # item validation is skipped if items are of the correct type
-        item = ArrayWithValidationsInItems.MetaOapg.Items(7)
+        item = ArrayWithValidationsInItems.Schema_.Items(7)
         with patch.object(
             ArrayWithValidationsInItems,
-            "_validate_oapg",
-            side_effect=ArrayWithValidationsInItems._validate_oapg,
+            "_validate",
+            side_effect=ArrayWithValidationsInItems._validate,
         ) as mock_outer_validate:
             with patch.object(
-                ArrayWithValidationsInItems.MetaOapg.Items,
-                "_validate_oapg",
-                side_effect=ArrayWithValidationsInItems.MetaOapg.Items._validate_oapg,
+                ArrayWithValidationsInItems.Schema_.Items,
+                "_validate",
+                side_effect=ArrayWithValidationsInItems.Schema_.Items._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                ArrayWithValidationsInItems([item], _configuration=used_configuration)
+                ArrayWithValidationsInItems([item], configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     tuple([Decimal('7')]),
                     validation_metadata=ValidationMetadata(
                         path_to_item=("args[0]",),
                         configuration=used_configuration,
-                        validated_path_to_schemas={('args[0]', 0): {ArrayWithValidationsInItems.MetaOapg.Items, Decimal}}
+                        validated_path_to_schemas={('args[0]', 0): {ArrayWithValidationsInItems.Schema_.Items, Decimal}}
                     )
                 )
                 mock_inner_validate.assert_not_called
@@ -217,16 +217,16 @@ def test_list_validate_direct_instantiation_cast_item(self):
     def test_list_validate_from_openai_data_instantiation(self):
         with patch.object(
             ArrayWithValidationsInItems,
-            "_validate_oapg",
-            side_effect=ArrayWithValidationsInItems._validate_oapg,
+            "_validate",
+            side_effect=ArrayWithValidationsInItems._validate,
         ) as mock_outer_validate:
             with patch.object(
-                ArrayWithValidationsInItems.MetaOapg.Items,
-                "_validate_oapg",
-                side_effect=ArrayWithValidationsInItems.MetaOapg.Items._validate_oapg,
+                ArrayWithValidationsInItems.Schema_.Items,
+                "_validate",
+                side_effect=ArrayWithValidationsInItems.Schema_.Items._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                ArrayWithValidationsInItems.from_openapi_data_oapg([7], _configuration=used_configuration)
+                ArrayWithValidationsInItems.from_openapi_data_([7], configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     (Decimal("7"),),
                     validation_metadata=ValidationMetadata(path_to_item=("args[0]",), configuration=used_configuration)
@@ -237,14 +237,14 @@ def test_list_validate_from_openai_data_instantiation(self):
                 )
 
     def test_dict_validate_direct_instantiation(self):
-        with patch.object(Foo, "_validate_oapg", side_effect=Foo._validate_oapg) as mock_outer_validate:
+        with patch.object(Foo, "_validate", side_effect=Foo._validate) as mock_outer_validate:
             with patch.object(
                 Bar,
-                "_validate_oapg",
-                side_effect=Bar._validate_oapg,
+                "_validate",
+                side_effect=Bar._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                Foo(bar="a", _configuration=used_configuration)
+                Foo(bar="a", configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     frozendict.frozendict({"bar": "a"}),
                     validation_metadata=ValidationMetadata(
@@ -263,14 +263,14 @@ def test_dict_validate_direct_instantiation(self):
     def test_dict_validate_direct_instantiation_cast_item(self):
         bar = StrSchema("a")
         # only the Foo dict is validated because the bar property value was already validated
-        with patch.object(Foo, "_validate_oapg", side_effect=Foo._validate_oapg) as mock_outer_validate:
+        with patch.object(Foo, "_validate", side_effect=Foo._validate) as mock_outer_validate:
             with patch.object(
                 Bar,
-                "_validate_oapg",
-                side_effect=Bar._validate_oapg,
+                "_validate",
+                side_effect=Bar._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                Foo(bar=bar, _configuration=used_configuration)
+                Foo(bar=bar, configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     frozendict.frozendict(dict(bar='a')),
                     validation_metadata=ValidationMetadata(
@@ -282,14 +282,14 @@ def test_dict_validate_direct_instantiation_cast_item(self):
                 mock_inner_validate.assert_not_called()
 
     def test_dict_validate_from_openapi_data_instantiation(self):
-        with patch.object(Foo, "_validate_oapg", side_effect=Foo._validate_oapg) as mock_outer_validate:
+        with patch.object(Foo, "_validate", side_effect=Foo._validate) as mock_outer_validate:
             with patch.object(
                 Bar,
-                "_validate_oapg",
-                side_effect=Bar._validate_oapg,
+                "_validate",
+                side_effect=Bar._validate,
             ) as mock_inner_validate:
                 used_configuration = configuration.Configuration()
-                Foo.from_openapi_data_oapg({"bar": "a"}, _configuration=used_configuration)
+                Foo.from_openapi_data_({"bar": "a"}, configuration_=used_configuration)
                 mock_outer_validate.assert_called_once_with(
                     frozendict.frozendict({"bar": "a"}),
                     validation_metadata=ValidationMetadata(